percheron 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f46c7382608bc1a9d0df8f0cfb476fdd3db6d168
-  data.tar.gz: 80f069209a8756e8e8ffd7ad5e9306439258d75e
+  metadata.gz: 3b2f1f9c52b7ccd444bd59daed1a2c5deeee49d1
+  data.tar.gz: efcdb60313993319297a27521355529e987fb664
 SHA512:
-  metadata.gz: 0994145a901b28e2cc993b3659128ff69e12e8253e0598b0f79a604bb64dde23a6ae19fa2ff96c35bf2442b883de6c2c22b6b4e96d90ebd43aa15fccd4c7263f
-  data.tar.gz: 686b119e1190e27e7cbf7cf96e1785eb5c4d0f941cb1816135b4cb49a13d374a5813d6096d757f6f744567351a2f65b8bcc683b2c8f49e2ce52da2f5d77ebc61
+  metadata.gz: 593dc6d5b9cc520eeaaf570d9a45a21b5c47a2a649a0537cd41f484460b1474575135fccefaa6c30fd3fc7fba25ac32771b4aa02f9fab9d7e20cfb202cedebfc
+  data.tar.gz: 30b83d1150ccde52bc2b5bbbb7c57a4db8566d5d55c325238b01e440886fe2d44c1c8480cab392de7fcb946f5a2aff32fde3d0fc2616646bc82d18f24c297152

data/Gemfile

@@ -7,6 +7,6 @@ group :test do
 end
 
 group :development do
-  gem 'pry-byebug', '~> 2.0'
+  gem 'pry-byebug', '~> 3.0'
   gem 'awesome_print', '~> 1.0'
 end

data/README.md

@@ -3,6 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/percheron.svg)](http://badge.fury.io/rb/percheron)
 [![Travis CI](https://travis-ci.org/ashmckenzie/percheron.svg)](https://travis-ci.org/ashmckenzie/percheron)
 [![Code Climate GPA](https://codeclimate.com/github/ashmckenzie/percheron/badges/gpa.svg)](https://codeclimate.com/github/ashmckenzie/percheron)
+[![Dependency Status](https://gemnasium.com/ashmckenzie/percheron.svg)](https://gemnasium.com/ashmckenzie/percheron)
 
 Organise your Docker containers with muscle and intelligence.
 

data/bin/percheron

@@ -9,7 +9,7 @@ require 'percheron/cli'
 
 $logger = Logger.new(STDOUT)
 
-logger_level = Logger::ERROR
+logger_level = Logger::WARN
 
 if ENV['VERBOSE'] == 'true'
   logger_level = Logger::INFO

data/lib/percheron/container/actions/create.rb

@@ -8,8 +8,12 @@ module Percheron
         end
 
         def execute!
-          Container::Actions::Build.new(container).execute! unless image_exists?
-          $logger.debug "Creating '#{container.name}'"
+          unless image_exists?
+            $logger.debug "Creating '#{container.image}' image"
+            Container::Actions::Build.new(container).execute!
+          end
+
+          $logger.debug "Creating '#{container.name}' container"
           Docker::Container.create(create_opts)
         end
 

data/lib/percheron/container/actions/stop.rb

@@ -12,6 +12,7 @@ module Percheron
             $logger.debug "Stopping '#{container.name}'"
             container.docker_container.stop!
           else
+            $logger.debug "Not stopping '#{container.name}' container as it's not running"
             raise Errors::ContainerNotRunning.new
           end
         end

data/lib/percheron/container/main.rb

@@ -5,10 +5,13 @@ module Percheron
       extend Forwardable
       extend ConfigDelegator
 
-      def_delegators :container_config, :name, :version
+      def_delegators :container_config, :name, :dockerfile_md5
 
+      def_config_item_with_default :container_config, false, :auto_recreate
       def_config_item_with_default :container_config, [], :env, :ports, :volumes, :dependant_container_names
 
+      alias_method :auto_recreate?, :auto_recreate
+
       def initialize(config, stack, container_name)
         @config = config
         @stack = stack
@@ -17,23 +20,20 @@ module Percheron
         self
       end
 
-      def stop!
-        Container::Actions::Stop.new(self).execute!
-      rescue Errors::ContainerNotRunning
-        $logger.debug "Container '#{name}' is not running"
+      def id
+        exists? ? info.id[0...12] : 'N/A'
       end
 
-      def start!
-        Container::Actions::Create.new(self).execute! unless exists?
-        Container::Actions::Start.new(self).execute!
+      def image
+        '%s:%s' % [ name, version.to_s ]
       end
 
-      def id
-        exists? ? info.id[0...12] : 'N/A'
+      def version
+        Semantic::Version.new(container_config.version)
       end
 
-      def image
-        '%s:%s' % [ name, version ]
+      def built_version
+        exists? ? Semantic::Version.new(built_image_version) : nil
       end
 
       def dockerfile
@@ -59,6 +59,25 @@ module Percheron
         Container::Null.new
       end
 
+      def stop!
+        Container::Actions::Stop.new(self).execute!
+      rescue Errors::ContainerNotRunning
+        $logger.debug "Container '#{name}' is not running"
+      end
+
+      def start!
+        Container::Actions::Create.new(self).execute! unless exists?
+        Container::Actions::Start.new(self).execute!
+      end
+
+      def recreatable?
+        exists? && !md5s_match?
+      end
+
+      def recreate?
+        recreatable? && versions_mismatch? && auto_recreate?
+      end
+
       def running?
         exists? && info.State.Running
       end
@@ -75,6 +94,26 @@ module Percheron
 
         attr_reader :config, :stack, :container_name
 
+        def md5s_match?
+          stored_dockerfile_md5 == current_dockerfile_md5
+        end
+
+        def versions_mismatch?
+          version > built_version
+        end
+
+        def built_image_version
+          info.Config.Image.split(':')[1]
+        end
+
+        def stored_dockerfile_md5
+          dockerfile_md5 || current_dockerfile_md5
+        end
+
+        def current_dockerfile_md5
+          Digest::MD5.file(dockerfile).hexdigest
+        end
+
         def info
           Hashie::Mash.new(docker_container.info)
         end

data/lib/percheron/formatters/stack/table.rb

@@ -33,7 +33,7 @@ module Percheron
               [
                 container_name,
                 container.id,
-                container.version,
+                container.built_version,
                 container.running?
               ]
             end

data/lib/percheron/validators/container.rb

@@ -33,7 +33,10 @@ module Percheron
         end
 
         def validate_version
-          'Version is invalid' if container.version.nil? || !container.version.to_s.match(/[\w\d]{1,}/)
+          container.version
+          nil
+        rescue ArgumentError
+          'Version is invalid'
         end
 
         def validate_dockerfile

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/percheron.rb

@@ -3,6 +3,7 @@ require 'forwardable'
 require 'pathname'
 require 'docker'
 require 'naught'
+require 'semantic'
 
 require 'percheron/core_extensions'
 require 'percheron/version'

data/percheron.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = [ 'lib' ]
 
   spec.add_runtime_dependency 'clamp', '~> 0.6'
-  spec.add_runtime_dependency 'docker-api', '~> 1.13'
+  spec.add_runtime_dependency 'docker-api', '~> 1.20'
   spec.add_runtime_dependency 'hashie', '~> 3.2'
   spec.add_runtime_dependency 'terminal-table', '~> 1.4'
   spec.add_runtime_dependency 'naught', '~> 1.0'
+  spec.add_runtime_dependency 'semantic', '~> 1.4'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: semantic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement