percheron 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e1af8757e13bcb1ab2e0d94dbc5d6d1149ff5ec
-  data.tar.gz: 8287c265fd6d1799e0a3ee955fde3594c29b288e
+  metadata.gz: e4d585a406d9b1b5a23ef33013450d00755ceaf3
+  data.tar.gz: a63795fa29c8c6fd05de2f6bf9587c57bf0f98bb
 SHA512:
-  metadata.gz: d379100dca1cd6c41aa97cda26a298b0fe9a3d96af7cd4a85548fff6d9def4c6cc0b34730abd461216598083f97057b4360de2484f7e8179d6209a2a87beb37c
-  data.tar.gz: 554da2c090b33f6035e208deb94602a70b817353d7213c00a0727b2382e815be7c352d0a24189b42e871848ce4311263d38de358f832b7122e1314219edd1c8e
+  metadata.gz: 8b8b0e9fc1748c246c710ae0b52bf48f31665e0e9d4ae2445e4f9f5982e2461514dc194079f06c91da36c00671f05f4a02dd751a075b425bc4d4537bccf6f49e
+  data.tar.gz: 0e09f330cd3a70896296e65d9610c3381a82c246a67e0c672187a92f00a8ddda7364abc70b7bc6efbc048fb6e4ab8a6b1f74be93858d48ba11067e3fde7b8b27

data/README.md

@@ -3,8 +3,11 @@
 [![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)
+[![Test Coverage](https://codeclimate.com/github/ashmckenzie/percheron/badges/coverage.svg)](https://codeclimate.com/github/ashmckenzie/percheron)
 [![Dependency Status](https://gemnasium.com/ashmckenzie/percheron.svg)](https://gemnasium.com/ashmckenzie/percheron)
 
+![Perheron](https://raw.githubusercontent.com/ashmckenzie/percheron/cache-store/assets/percheron.png)
+
 Organise your Docker containers with muscle and intelligence.
 
 ## Installation

data/bin/percheron

@@ -7,6 +7,7 @@ require 'logger'
 require 'percheron'
 require 'percheron/cli'
 
+$metastore = Metastore::Cabinet.new(File.join(ENV['HOME'], '.percheron', 'metastore.yaml'))
 $logger = Logger.new(STDOUT)
 
 logger_level = Logger::WARN

data/lib/percheron/container/main.rb

@@ -5,7 +5,7 @@ module Percheron
       extend Forwardable
       extend ConfigDelegator
 
-      def_delegators :container_config, :name, :dockerfile_md5
+      def_delegators :container_config, :name
 
       def_config_item_with_default :container_config, false, :auto_recreate
       def_config_item_with_default :container_config, [], :env, :ports, :volumes, :dependant_container_names
@@ -80,6 +80,7 @@ module Percheron
         unless exists?
           $logger.debug "Container '#{name}' does not exist, creating"
           Container::Actions::Create.new(self).execute!
+          set_dockerfile_md5!
         else
           $logger.debug "Not creating '#{name}' container as it already exists"
         end
@@ -90,6 +91,7 @@ module Percheron
           if recreate?(bypass_auto_recreate: bypass_auto_recreate)
             $logger.warn "Container '#{name}' exists and will be recreated"
             Container::Actions::Recreate.new(self).execute!
+            set_dockerfile_md5!
           else
             if recreatable?
               $logger.warn "Container '#{name}' MD5's do not match, consider recreating"
@@ -122,7 +124,7 @@ module Percheron
         Validators::Container.new(self).valid?
       end
 
-      protected
+      private
 
         attr_reader :config, :stack, :container_name
 
@@ -142,6 +144,19 @@ module Percheron
           dockerfile_md5 || current_dockerfile_md5
         end
 
+        def metastore_key
+          @metastore_key ||= 'stacks.%s.containers.%s' % [ stack.name, name ]
+        end
+
+        def dockerfile_md5
+          $metastore.get("#{metastore_key}.dockerfile_md5")
+        end
+
+        def set_dockerfile_md5!
+          $logger.debug "Setting MD5 for '#{name}' container to #{current_dockerfile_md5}"
+          $metastore.set("#{metastore_key}.dockerfile_md5", current_dockerfile_md5)
+        end
+
         def current_dockerfile_md5
           Digest::MD5.file(dockerfile).hexdigest
         end

data/lib/percheron/docker_connection.rb

@@ -31,10 +31,7 @@ module Percheron
       end
 
       def base_docker_options
-        {
-          connect_timeout:  config.docker.timeout,
-          scheme:          'https'
-        }
+        { connect_timeout: config.docker.timeout }
       end
 
       def extra_docker_opts

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/percheron.rb

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

data/percheron.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'terminal-table', '~> 1.4'
   spec.add_runtime_dependency 'naught', '~> 1.0'
   spec.add_runtime_dependency 'semantic', '~> 1.4'
+  spec.add_runtime_dependency 'metastore', '~> 0.3'
 
   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.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: metastore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +194,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/percheron.png
 - bin/percheron
 - lib/percheron.rb
 - lib/percheron/cli.rb