harrison 0.3.0 → 0.4.0.b1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5a7a1e571b53bc0460cdfafd012a454a12a7abd7
+  data.tar.gz: 5b3899d0745b0a0cf49a7cb8babc02b88288cc4a
+SHA512:
+  metadata.gz: 62ab8175825b9102916f4a59cfc46ee8c22faf787ed66e753b1e8df31261b8c98e0267058ddab68ea6010fee6c333546e345f340733ff6ee9d51b94cf9dbbd9a
+  data.tar.gz: fee23a513d98d677e458448e2491e26086cd0199667fce84ca6240f1461f7110349ee0758badb7de9b83eb78bd061cd6b5b73e016aab664313431346da0c349b

data/harrison.gemspec

@@ -19,15 +19,16 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_runtime_dependency "trollop"
-  spec.add_runtime_dependency "net-ssh"
-  spec.add_runtime_dependency "net-scp"
+  spec.add_runtime_dependency "trollop", "~> 2.1.2"
+  spec.add_runtime_dependency "net-ssh", "~> 2.9.1"
+  spec.add_runtime_dependency "net-scp", "~> 1.2.1"
+  spec.add_runtime_dependency "highline", "~> 1.7.8"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "debugger" if RUBY_VERSION < "2.0.0"
-  spec.add_development_dependency "byebug" if RUBY_VERSION >= "2.0.0"
+  spec.add_development_dependency "pry-debugger" if RUBY_VERSION < "2.0.0"
+  spec.add_development_dependency "pry-byebug" if RUBY_VERSION >= "2.0.0"
   spec.add_development_dependency "sourcify"
 end

data/lib/harrison.rb

@@ -7,6 +7,11 @@ require "harrison/package"
 require "harrison/deploy"
 require "harrison/deploy/phase"
 
+begin
+  require "pry"
+rescue LoadError
+end
+
 module Harrison
 
   def self.invoke(args)

data/lib/harrison/base.rb

@@ -23,12 +23,10 @@ module Harrison
       end
     end
 
-    # Find config from Harrison.config if it's not on this class.
-    def method_missing(meth, *args, &block)
-      if Harrison.config.respond_to?(meth)
-        Harrison.config.send(meth, *args, &block)
-      else
-        super
+    # Add config getter methods from Harrison.config to this class.
+    Harrison::Config.config_keys.each do |key|
+      define_method(key) do
+        Harrison.config.send(key)
       end
     end
 

data/lib/harrison/config.rb

@@ -1,9 +1,16 @@
 module Harrison
   class Config
-    attr_accessor :project
-    attr_accessor :git_src
-
     def initialize(opts={})
+      self.class.config_keys.each do |key|
+        self.class.send(:attr_accessor, key)
+      end
+    end
+
+    def self.config_keys
+      [
+        :project,
+        :git_src,
+      ]
     end
   end
 end

data/lib/harrison/deploy.rb

@@ -1,3 +1,5 @@
+require 'highline'
+
 module Harrison
   class Deploy < Base
     attr_accessor :artifact
@@ -17,12 +19,14 @@ module Harrison
       self.class.option_helper(:base_dir)
       self.class.option_helper(:deploy_via)
       self.class.option_helper(:keep)
+      self.class.option_helper(:confirm)
 
       # Command line opts for this action. Will be merged with common opts.
       arg_opts = [
         [ :hosts, "List of remote hosts to deploy to. Can also be specified in Harrisonfile.", :type => :strings ],
         [ :env, "Environment to deploy to. This can be examined in your Harrisonfile to calculate target hosts.", :type => :string ],
         [ :keep, "Number of recent deploys to keep after a successful deploy. (Including the most recent deploy.) Defaults to keeping all deploys forever.", :type => :integer ],
+        [ :confirm, "Whether to interactively confirm the list of target hosts for deployment.", :type => :flag, :default => true ],
       ]
 
       super(arg_opts, opts)
@@ -59,7 +63,8 @@ module Harrison
     end
 
     def update_current_symlink
-      @_old_current = self.remote_exec("if [ -L #{current_symlink} ]; then readlink -vn #{current_symlink}; fi")
+      # Conditional assignment here makes this idempotent.
+      @_old_current ||= self.remote_exec("if [ -L #{current_symlink} ]; then readlink -vn #{current_symlink}; fi")
       @_old_current = nil if @_old_current.empty?
 
       # Symlink current to new deploy.
@@ -77,11 +82,24 @@ module Harrison
       # Override Harrisonfile hosts if it was passed on argv.
       self.hosts = @_argv_hosts if @_argv_hosts
 
+      if self.hosts.respond_to?(:call)
+        resolved_hosts = self.hosts.call(self)
+        self.hosts = resolved_hosts
+      end
+
       # Require at least one host.
       if !self.hosts || self.hosts.empty?
         abort("ERROR: You must specify one or more hosts to deploy/rollback on, either in your Harrisonfile or via --hosts.")
       end
 
+      if self.confirm
+        self.hosts.each { |h| puts " - #{h}" }
+
+        exit unless HighLine.new.agree("\nProceed with above-listed hosts?")
+
+        puts ""
+      end
+
       # Default to just built in deployment phases.
       self.phases ||= [ :upload, :extract, :link, :cleanup ]
 

data/lib/harrison/deploy/phase.rb

@@ -7,6 +7,10 @@ module Harrison
 
       @conditions = Array.new
 
+      @limit = nil
+      @_run_count = 0
+      @_fail_count = 0
+
       yield self if block_given?
     end
 
@@ -14,7 +18,12 @@ module Harrison
       @conditions << block
     end
 
-    # Ensure all conditions eval to true for this context.
+    # Limit the number of times this phase is invoked per deployment.
+    def set_limit(n)
+      @limit = n
+    end
+
+    # Check if all conditions eval to true for this context.
     def matches_context?(context)
       @conditions.all? { |cblock| cblock.call(context) }
     end
@@ -29,21 +38,30 @@ module Harrison
 
     # These should only be invoked by the deploy action.
     def _run(context)
+      # Ensure limit has not been met.
+      return unless @limit.nil? || @_run_count < @limit
+
+      # Ensure all conditions eval to true for this context.
       return unless matches_context?(context)
 
       if @run_block
         puts "[#{context.host}] Executing \"#{self.name}\"..."
         @run_block.call(context)
+        @_run_count += 1
       end
     end
 
     def _fail(context)
+      # Ensure limit has not been met.
+      return unless @limit.nil? || @_fail_count < @limit
+
       # Ensure all conditions eval to true for this context.
       return unless matches_context?(context)
 
       if @fail_block
         puts "[#{context.host}] Reverting \"#{self.name}\"..."
         @fail_block.call(context)
+        @_fail_count += 1
       end
 
     end

data/lib/harrison/version.rb

@@ -1,3 +1,3 @@
 module Harrison
-  VERSION = "0.3.0"
+  VERSION = "0.4.0.b1"
 end

data/spec/unit/harrison/deploy_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe Harrison::Deploy do
+  before(:all) do
+    Harrison.class_variable_set(:@@config, Harrison::Config.new)
+    Harrison.config.project = 'test_project'
+  end
+
   let(:instance) do
     Harrison::Deploy.new.tap do |d|
       d.hosts = [ 'hf_host' ]
@@ -71,7 +76,6 @@ describe Harrison::Deploy do
     describe '#remote_exec' do
       before(:each) do
         instance.base_dir = '/opt'
-        instance.project = 'test_project'
 
         @mock_ssh = double(:ssh)
         expect(instance).to receive(:ssh).and_return(@mock_ssh)
@@ -157,7 +161,6 @@ describe Harrison::Deploy do
     describe '#run' do
       before(:each) do
         instance.artifact = 'test_artifact.tar.gz'
-        instance.project = 'test_project'
 
         @mock_ssh = double(:ssh, host: 'test_host1', exec: '', upload: true, download: true)
         allow(instance).to receive(:ssh).and_return(@mock_ssh)
@@ -254,8 +257,6 @@ describe Harrison::Deploy do
         before(:each) do
           instance.rollback = true
 
-          instance.project = 'test_project'
-
           @mock_ssh = double(:ssh, host: 'test_host1', exec: '', upload: true, download: true)
           allow(instance).to receive(:ssh).and_return(@mock_ssh)
         end
@@ -389,7 +390,6 @@ describe Harrison::Deploy do
     describe '#remote_project_dir' do
       it 'should combine base_dir and project name' do
         instance.base_dir = '/test_base_dir'
-        instance.project = 'test_project'
 
         expect(instance.send(:remote_project_dir)).to include('/test_base_dir', 'test_project')
       end

data/spec/unit/harrison/package_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
 
 describe Harrison::Package do
+  before(:all) do
+    Harrison.class_variable_set(:@@config, Harrison::Config.new)
+    Harrison.config.project = 'test_project'
+  end
+
   let(:instance) do
     Harrison::Package.new.tap do |p|
-      p.project = 'test_project'
       p.host = 'hf_host'
       p.commit = 'HEAD'
     end
@@ -43,7 +47,6 @@ describe Harrison::Package do
 
       it 'should prepend remote build dir onto passed command' do
         instance.remote_dir = '~/.harrison'
-        instance.project = 'test_project'
 
         expect(@mock_ssh).to receive(:exec).with("cd ~/.harrison/test_project/package && test_command").and_return('')
 
@@ -89,7 +92,6 @@ describe Harrison::Package do
     describe '#remote_project_dir' do
       it 'should combine remote dir and project name' do
         instance.remote_dir = '~/.harrison'
-        instance.project = 'test_project'
 
         expect(instance.send(:remote_project_dir)).to include('~/.harrison', 'test_project')
       end

metadata

@@ -1,158 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: harrison
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0.b1
 platform: ruby
 authors:
 - Jesse Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.1
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sourcify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -163,9 +158,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - IDEAS
@@ -195,30 +190,26 @@ files:
 homepage: https://github.com/puppetlabs/harrison
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2429299049933717858
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple artifact-based deployment for web applications.
 test_files:
 - spec/fixtures/Harrisonfile