fig-lock 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf65230525cc94224a28ccc8387a29c5de3557d4
-  data.tar.gz: 7eaa81a30dc3a9611b8fb5a4ce22797a00d1d4b0
+  metadata.gz: 1019d9bc52a6930d08d2081f060a7e1f6b279bd0
+  data.tar.gz: d6f8c98733fc2ecd62f3a9e3a605df0e51e8bfe9
 SHA512:
-  metadata.gz: 3e5808866906d23d274d4c250a5c91a4e95ac7f147bde50431799b68e1e6ba755f6d51e7936f5d83999c1d77a30211fb81a20cc179e01d9b6f9bb506342937a6
-  data.tar.gz: 951e80d34a26d8a612e82027540a04694683a5881b04d8894a994122e1b911cae6a510e90a7e16baa96d23d4f1c589204fc3837c405fd22683a3fde9592ae1df
+  metadata.gz: 007170d706e208f31cb555abb0d5469aab2a7cf4d49f074b4354cffdd9f584d4dc2c27bb2943ea52e37dbaac5029a94f30498638e5e2b68844a582bc27456f42
+  data.tar.gz: 54b9256feeafded12eada0bdaa82018f4ae17809c1f7c643f582c36b0313b420fb451a614a5c188106e04bf47cadbfc70fef499443474092eb96e16e32103b4f

data/lib/fig/lock.rb

@@ -4,158 +4,158 @@ require 'fig/lock/log'
 require 'fig/lock/version'
 
 module Fig
+class Lock
+  class << self
+def install(opts={})
+  Lock.new(opts).install
+  end
+
+def update(opts={})
+  Lock.new(opts).update
+  end
+  end
+  end
+  end
+
+  module Fig
   class Lock
-    class << self
-      def install(opts={})
-        Lock.new(opts).install
-      end
+  include Fig::Lock::Log
+
+  attr_reader :lock_file, :file
+
+  def initialize(opts)
+opts = merge_opts(opts)
+  @file = opts[:file]
+@lock_file = lock_file_name(file)
 
-      def update(opts={})
-        Lock.new(opts).update
-      end
-    end
+  fail "File #{file} does not exist" unless File.exists?(file)
+  fail "File #{file} is a directory" if File.directory?(file)
+  end
+
+# Install images from a lock file on the local system
+  def install
+if File.exists?(lock_file)
+  log.info "Lock file #{lock_file} found."
+fetch_images(YAML.load(File.read(lock_file)))
+  else
+  log.info "No lock file found."
+  update
+  end
   end
+
+# Update an existing lock file, or create if none exists
+  def update
+  log.info "Generating lock file for #{file} ..."
+  hash = YAML.load(File.read(file))
+select_latest(hash)
+
+  log.info "Writing lock file #{lock_file} ..."
+File.write(lock_file, hash.to_yaml)
+
+  log.info "Done."
+  end
+
+  private
+
+# Construct the name of the lock file from the name of the fig file
+def lock_file_name(file)
+  index = file.rindex('.')
+  raise "Input file #{file} has no file extension" unless index
+  file[0, index] << '.lock'
+  end
+
+# Select the latest version for images in the fig hash. Updates the input hash.
+def select_latest(hash)
+  log.info "Selecting latest tags:"
+
+  resolved_tags = {}
+
+  old_lock_yaml = lock_yaml
+
+  hash.each do |k,v|
+  image = v['image']
+  next unless image
+  image = "#{image}:latest" unless image.index(':')
+  log.info "Selecting latest tag for #{image} ..."
+
+  unless image.nil?
+  result = resolved_tags[image]
+  if result
+  log.debug "Using previously resolved image: #{result}"
+  else
+# Fetch tags
+tags = docker_client.tags(image)
+  latest = tags['latest']
+  fail "Image #{image} has no latest tag" if latest.nil?
+
+# Figure out which one corresponds to "latest"
+  version = tags.detect{|k,v|
+    v == latest && k != 'latest'
+  }
+version = version[0] if version
+fail "No matching version found for hash #{latest}" unless version
+
+result = "#{image[0..image.rindex(':')-1]}:#{version}"
+log.debug "Resolved image: #{result}"
+resolved_tags[image] = result
 end
 
-module Fig
-  class Lock
-    include Fig::Lock::Log
-
-    attr_reader :lock_file, :file
-
-    def initialize(opts)
-      opts = merge_opts(opts)
-      @file = opts[:file]
-      @lock_file = lock_file_name(file)
-
-      fail "File #{file} does not exist" unless File.exists?(file)
-      fail "File #{file} is a directory" if File.directory?(file)
-    end
-
-    # Install images from a lock file on the local system
-    def install
-      if File.exists?(lock_file)
-        log.info "Lock file #{lock_file} found."
-        fetch_images(YAML.load(File.read(lock_file)))
-      else
-        log.info "No lock file found."
-        update
-      end
-    end
-
-    # Update an existing lock file, or create if none exists
-    def update
-      log.info "Generating lock file for #{file} ..."
-      hash = YAML.load(File.read(file))
-      select_latest(hash)
-
-      log.info "Writing lock file #{lock_file} ..."
-      File.write(lock_file, hash.to_yaml)
-
-      log.info "Done."
-    end
-
-    private
-
-    # Construct the name of the lock file from the name of the fig file
-    def lock_file_name(file)
-      index = file.rindex('.')
-      raise "Input file #{file} has no file extension" unless index
-      file[0, index] << '.lock'
-    end
-
-    # Select the latest version for images in the fig hash. Updates the input hash.
-    def select_latest(hash)
-      log.info "Selecting latest tags:"
-
-      resolved_tags = {}
-
-      old_lock_yaml = lock_yaml
-
-      hash.each do |k,v|
-        image = v['image']
-        continue unless image
-        image = "#{image}:latest" unless image.index(':')
-        log.info "Selecting latest tag for #{image} ..."
-
-        unless image.nil?
-          result = resolved_tags[image]
-          if result
-            log.debug "Using previously resolved image: #{result}"
-          else
-            # Fetch tags
-            tags = docker_client.tags(image)
-            latest = tags['latest']
-            fail "Image #{image} has no latest tag" if latest.nil?
-
-            # Figure out which one corresponds to "latest"
-            version = tags.detect{|k,v|
-              v == latest && k != 'latest'
-            }
-            version = version[0] if version
-            fail "No matching version found for hash #{latest}" unless version
-
-            result = "#{image[0..image.rindex(':')-1]}:#{version}"
-            log.debug "Resolved image: #{result}"
-            resolved_tags[image] = result
-          end
-
-          # Update hash
-          v['image'] = result
-          if old_lock_yaml && old_lock_yaml[k] && old_lock_yaml[k]['image'] == result
-            log.debug "Component #{k} already using tag: #{result}"
-          else
-            log.info "Component #{k} updated to tag: #{result}"
-          end
-        end
-      end
-    end
-
-    def lock_yaml
-      if File.exists?(lock_file)
-        YAML.load(File.read(lock_file))
-      end
-    end
-
-    # Fetch all images from the fig hash.
-    def fetch_images(hash)
-      log.info "Fetching images:"
-      hash.each do |k,v|
-        image = v['image']
-        if image
-          log.info "Fetching #{image} ..."
-          system "sudo docker pull #{image}"
-          fail "Unable to fetch image: #{image}.\n\tExit code:#{$?.exitstatus}" unless $?.exitstatus.zero?
-        end
-      end
-      log.info "Done fetching images."
-    end
-
-    def merge_opts(opts)
-      Defaults.opts.merge(opts).tap do |hash|
-        fail("file must be specified") unless hash[:file]
-      end
-    end
-
-    def docker_client
-      @docker_client ||= DockerClient.new
-    end
-  end
-
-  # Default values for parameters
-  class Defaults
-    class << self
-      def opts
-        {
-          file: file
-        }
-      end
-
-      def file
-        ENV.fetch 'FIG_FILE', File.join(__dir__, 'fig.yml')
-      end
-    end
+# Update hash
+v['image'] = result
+if old_lock_yaml && old_lock_yaml[k] && old_lock_yaml[k]['image'] == result
+log.debug "Component #{k} already using tag: #{result}"
+else
+log.info "Component #{k} updated to tag: #{result}"
+end
+end
+end
+end
+
+  def lock_yaml
+  if File.exists?(lock_file)
+YAML.load(File.read(lock_file))
+  end
+  end
+
+# Fetch all images from the fig hash.
+def fetch_images(hash)
+  log.info "Fetching images:"
+  hash.each do |k,v|
+  image = v['image']
+  if image
+  log.info "Fetching #{image} ..."
+  system "sudo docker pull #{image}"
+  fail "Unable to fetch image: #{image}.\n\tExit code:#{$?.exitstatus}" unless $?.exitstatus.zero?
+  end
+  end
+  log.info "Done fetching images."
+  end
+
+def merge_opts(opts)
+  Defaults.opts.merge(opts).tap do |hash|
+  fail("file must be specified") unless hash[:file]
   end
+  end
+
+  def docker_client
+  @docker_client ||= DockerClient.new
+  end
+  end
+
+# Default values for parameters
+  class Defaults
+  class << self
+  def opts
+{
+file: file
+}
+end
+
+def file
+ENV.fetch 'FIG_FILE', File.join(__dir__, 'fig.yml')
+end
+end
+end
 
 
 end

data/lib/fig/lock/version.rb

@@ -1,5 +1,5 @@
 module Fig
   class Lock
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fig-lock
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Michael Shea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client