percheron 0.6.4 → 0.7.0

data/lib/percheron/validators/stack.rb

@@ -10,7 +10,7 @@ module Percheron
         message = rules.return { |rule| send(rule) }
 
         if message
-          raise Errors::StackInvalid.new(message)
+          fail Errors::StackInvalid, message
         else
           true
         end
@@ -21,13 +21,11 @@ module Percheron
         attr_reader :stack
 
         def rules
-          [
-            :validate_name
-          ]
+          [ :validate_name ]
         end
 
         def validate_name
-          'Name is invalid' if stack.name.nil? || !stack.name.to_s.match(/[\w\d]{3,}/)
+          'Stack name is invalid' if stack.name.nil? || !stack.name.to_s.match(/[\w\d]{3,}/)
         end
 
     end

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = "0.6.4"
+  VERSION = '0.7.0'
 end

data/lib/percheron.rb

@@ -5,6 +5,7 @@ require 'docker'
 require 'naught'
 require 'semantic'
 require 'metastore'
+require 'liquid'
 
 require 'percheron/oh_dear'
 require 'percheron/core_extensions'
@@ -15,6 +16,7 @@ require 'percheron/config_delegator'
 require 'percheron/formatters'
 require 'percheron/validators'
 require 'percheron/stack'
+require 'percheron/null_stack'
 require 'percheron/container'
 require 'percheron/null_container'
 require 'percheron/actions'

data/percheron.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = [ 'Ash McKenzie' ]
   spec.email         = [ 'ash@the-rebellion.net' ]
 
-  spec.summary       = %q{Organise your Docker containers with muscle and intelligence}
+  spec.summary       = 'Organise your Docker containers with muscle and intelligence'
   spec.homepage      = 'https://github.com/ashmckenzie/percheron'
   spec.license       = 'MIT'
 
@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'semantic', '~> 1.4'
   spec.add_runtime_dependency 'metastore', '~> 0.3'
   spec.add_runtime_dependency 'highline', '~> 1.7.1'
+  spec.add_runtime_dependency 'liquid', '~> 3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -33,4 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec', '~> 4.5'
   spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_development_dependency 'timecop', '~> 0.7'
+  spec.add_development_dependency 'rubocop', '~> 0.30.0'
+  spec.add_development_dependency 'cane', '~> 2.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.1
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +220,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.30.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.30.0
+- !ruby/object:Gem::Dependency
+  name: cane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 description: 
 email:
 - ash@the-rebellion.net
@@ -214,8 +256,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".cane"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -223,7 +267,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- assets/percheron.png
 - bin/percheron
 - lib/percheron.rb
 - lib/percheron/actions.rb
@@ -232,21 +275,25 @@ files:
 - lib/percheron/actions/create.rb
 - lib/percheron/actions/exec.rb
 - lib/percheron/actions/exec_local.rb
+- lib/percheron/actions/logs.rb
 - lib/percheron/actions/purge.rb
 - lib/percheron/actions/recreate.rb
-- lib/percheron/actions/rename.rb
 - lib/percheron/actions/restart.rb
+- lib/percheron/actions/shell.rb
 - lib/percheron/actions/start.rb
 - lib/percheron/actions/stop.rb
 - lib/percheron/commands.rb
 - lib/percheron/commands/abstract.rb
+- lib/percheron/commands/build.rb
 - lib/percheron/commands/console.rb
 - lib/percheron/commands/create.rb
 - lib/percheron/commands/list.rb
+- lib/percheron/commands/logs.rb
 - lib/percheron/commands/main.rb
 - lib/percheron/commands/purge.rb
 - lib/percheron/commands/recreate.rb
 - lib/percheron/commands/restart.rb
+- lib/percheron/commands/shell.rb
 - lib/percheron/commands/start.rb
 - lib/percheron/commands/stop.rb
 - lib/percheron/config.rb
@@ -258,7 +305,10 @@ files:
 - lib/percheron/formatters.rb
 - lib/percheron/formatters/stack.rb
 - lib/percheron/formatters/stack/table.rb
+- lib/percheron/logger.rb
+- lib/percheron/metastore.rb
 - lib/percheron/null_container.rb
+- lib/percheron/null_stack.rb
 - lib/percheron/oh_dear.rb
 - lib/percheron/stack.rb
 - lib/percheron/validators.rb

data/lib/percheron/actions/rename.rb

@@ -1,65 +0,0 @@
-module Percheron
-  module Actions
-    class Rename
-
-      include Base
-
-      def initialize(container, temporary_name, new_name)
-        @container = container
-        @temporary_name = temporary_name
-        @new_name = new_name
-      end
-
-      def execute!
-        results = []
-        results << rename!
-        results.compact.empty? ? nil : container
-      end
-
-      private
-
-        attr_reader :container, :temporary_name, :new_name
-
-        def rename_current_new_name
-          @rename_current_new_name ||= '%s_%s' % [ container.name, now_timestamp ]
-        end
-
-        def old_container
-          Docker::Container.get(rename_current_new_name)
-        end
-
-        def temporary_container
-          Docker::Container.get(temporary_name)
-        end
-
-        def rename!
-          container_running = container.running?
-          stop_containers!([ container ])   if container_running
-          rename_containers!
-          start_containers!([ container ])  if container_running
-          remove_old!
-        end
-
-        def rename_containers!
-          rename_container_current_to_old! if container.exists?
-          rename_container_temporary_to_new!
-        end
-
-        def rename_container_current_to_old!
-          $logger.info "Renaming '#{container.name}' container to '#{rename_current_new_name}'"
-          container.docker_container.rename(rename_current_new_name)
-        end
-
-        def rename_container_temporary_to_new!
-          $logger.info "Renaming '#{temporary_name}' container to '#{new_name}'"
-          temporary_container.rename(new_name)
-        end
-
-        def remove_old!
-          $logger.info "Removing '#{rename_current_new_name}' container"
-          old_container.remove
-        end
-
-    end
-  end
-end