engineyard-serverside-adapter 2.2.2 → 2.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzhmM2I1OGE3MTFlOTQyMTIxZDczMTU0ZDIxMjIxYTNjODJiNjkyZg==
+    ZjhmY2NmYmNiNTJkYzEzYmQwODEzOGMwNjM4Y2U4MTliNmFkYjY3NA==
   data.tar.gz: !binary |-
-    YzkwZDgxOTljZDI0ZTZlMzJhNTk4ZWE4MWY0YTZhYmY0ZjhiYjQzMQ==
-!binary "U0hBNTEy":
+    NDJhNGEwYzM1YmIyN2M0NGNhMTI5MmQ3MTFmNDg1ZjQxODdmNjg5NQ==
+SHA512:
   metadata.gz: !binary |-
-    MWFjYTE4MWFhNDZhMDAxY2EyY2UzZjdiNTRmYmUyZDBhNzhlNTU0M2VhNmEz
-    ZmQ5NjI0YzRkYWY1ZTZjYTg5NzNlZjFkOTk1YjljYmMzY2FhODc1Mjc1MmFh
-    NTkyMDFkZWJkYWQ1NDMzNjU3MTZhNzU4YzJkM2RlZjg4MTg5YWE=
+    NjA5MWI4Njc5NTUyNzY2Y2VjOWRlNTU5YzhkYzAzMTQ0YzJlMWVjZmIxMWYz
+    MWFkZjVmNmZlMmY5ZDkzOTdhN2VmZWQwNDI4NzcxMTc2OWUyODMyNTlkNmI3
+    MTVhMWU1ZDA2ZGQ2NzA4MjVjZmM5OThhNmRmNGExZjljZGQxMGY=
   data.tar.gz: !binary |-
-    ODkzODI5OWQ1Mzk2OGZlYmMyYmE4ZGExN2I4NmEwYWUyYjQ0ZmI4MjljZTI2
-    MzFkNmU0YTgzN2QyODYwYWMyN2Q2M2Y0NDg3MTg1YTU0NmUyNWRmMjQ4ODcz
-    ZDE4YzQ4MTc1MjNhZGQyOWFmN2Q4ZDFmNDcwMDhjNjRmZGU5OGQ=
+    MTZkZjIwOWQ0NjEwYzM4NjUxNTYwYTc5YWNmODc1OTZhNDIyMGM0YjYyZWJm
+    MDQxODQxMzc4NzNmMDRiNmEzM2ZjMzY5YjUwOWM3YzUzOGM1MzgzMzBjMmNj
+    YmI2YjFmZjUzM2RlZTFhODMwN2E1YjgyZmQyZTZmY2I3YzI4YjE=

data/ChangeLog.md

@@ -4,6 +4,10 @@
 
   *
 
+## v2.3.0 (2014-06-02)
+
+  * Support new --ignore-existing option for integrate, which tells rsync not to overwrite existing files on the destination server when syncing existing app files before deploy.
+
 ## v2.2.2 (2013-10-10)
 
   * Remove --clean option form Integrate command. We've decided that integrate should just always run clean.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rspec/core/rake_task'
 require 'date'
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = ['-cfs']
+  t.rspec_opts = ['-c']
 end
 task :default => :spec
 

data/lib/engineyard-serverside-adapter.rb

@@ -7,12 +7,15 @@ module EY
       autoload :Action,                 'engineyard-serverside-adapter/action'
       autoload :Arguments,              'engineyard-serverside-adapter/arguments'
       autoload :Command,                'engineyard-serverside-adapter/command'
-      autoload :Deploy,                 'engineyard-serverside-adapter/deploy'
-      autoload :DisableMaintenance,     'engineyard-serverside-adapter/disable_maintenance'
-      autoload :EnableMaintenance,      'engineyard-serverside-adapter/enable_maintenance'
-      autoload :Integrate,              'engineyard-serverside-adapter/integrate'
-      autoload :Restart,                'engineyard-serverside-adapter/restart'
-      autoload :Rollback,               'engineyard-serverside-adapter/rollback'
+      autoload :CommandOptions,         'engineyard-serverside-adapter/command_options'
+
+      # Backwards compatibility
+      autoload :Deploy,                 'engineyard-serverside-adapter/action/deploy'
+      autoload :DisableMaintenance,     'engineyard-serverside-adapter/action/disable_maintenance'
+      autoload :EnableMaintenance,      'engineyard-serverside-adapter/action/enable_maintenance'
+      autoload :Integrate,              'engineyard-serverside-adapter/action/integrate'
+      autoload :Restart,                'engineyard-serverside-adapter/action/restart'
+      autoload :Rollback,               'engineyard-serverside-adapter/action/rollback'
 
       def initialize(gem_bin_path = "", &block)
         @gem_bin_path = Pathname.new(gem_bin_path)

data/lib/engineyard-serverside-adapter/action.rb

@@ -7,14 +7,17 @@ module EY
   module Serverside
     class Adapter
       class Action
+        autoload :Deploy,                 'engineyard-serverside-adapter/action/deploy'
+        autoload :DisableMaintenance,     'engineyard-serverside-adapter/action/disable_maintenance'
+        autoload :EnableMaintenance,      'engineyard-serverside-adapter/action/enable_maintenance'
+        autoload :Integrate,              'engineyard-serverside-adapter/action/integrate'
+        autoload :Restart,                'engineyard-serverside-adapter/action/restart'
+        autoload :Rollback,               'engineyard-serverside-adapter/action/rollback'
 
-        class << self
-          attr_accessor :options
+        extend CommandOptions::ClassMethods
 
-          def option(*args)
-            self.options ||= []
-            options << Option.new(*args)
-          end
+        def command_options
+          self.class.command_options
         end
 
         GEM_NAME = 'engineyard-serverside'
@@ -29,8 +32,6 @@ module EY
 
           block.call @arguments if block
 
-          @serverside_version = @arguments.serverside_version
-
           validate!
         end
 
@@ -48,10 +49,6 @@ module EY
 
       private
 
-        def applicable_options
-          @applicable_options ||= self.class.options.select { |option| option.on_version?(@serverside_version) }
-        end
-
         def check_and_install_command
           "(#{check_command}) || (#{install_command})"
         end
@@ -92,7 +89,7 @@ module EY
           Command.new(serverside_command_path, @serverside_version, *task) do |cmd|
             given_applicable_options = given_options & applicable_options
             given_applicable_options.each do |option|
-              cmd.send("#{option.type}_argument", option.to_switch, @arguments.send(option.name))
+              cmd.argument(option.type, option.to_switch, @arguments[option.name])
             end
           end
         end
@@ -108,18 +105,21 @@ module EY
         # to exclude archive from a older version and then perform a git
         # deploy, which really we should have errored for receiving both.
         def given_options
-          @given_options ||= self.class.options.select do |option|
-            @arguments.send(option.name) || option.include?
+          @given_options ||= command_options.select do |option|
+            @arguments[option.name] || option.include?
           end
         end
 
+        def applicable_options
+          command_options.applicable(@serverside_version)
+        end
+
         def required_options
-          applicable_options.select do |option|
-            option.required_on_version?(@serverside_version)
-          end
+          command_options.required(@serverside_version)
         end
 
         def validate!
+          @serverside_version = @arguments.serverside_version
           unless @serverside_version
             raise ArgumentError, "Required field [serverside_version] not provided."
           end

data/lib/engineyard-serverside-adapter/{deploy.rb → action/deploy.rb}

@@ -1,6 +1,6 @@
-module EY
-  module Serverside
-    class Adapter
+module EY::Serverside
+  class Adapter
+    class Action
       class Deploy < Action
 
         option :app,              :string,    :required => true
@@ -11,7 +11,9 @@ module EY
         option :environment_name, :string,    :required => true,      :version => '>= 2.0.0'
         option :git,              :string,                            :version => '>= 2.3.0'
         option :framework_env,    :string,    :required => true
-        option :instances,        :instances, :required => true
+        option :instance_names,   :hash,      :required => true
+        option :instance_roles,   :hash,      :required => true
+        option :instances,        :array,     :required => true
         option :migrate,          :string,                            :include => true
         option :ref,              :string,    :required => '< 2.3.0'
         option :repo,             :string,    :required => '< 2.3.0', :version => '< 2.3.0'
@@ -36,6 +38,9 @@ module EY
           end
         end
       end
+
+      # backwards compatibility
+      EY::Serverside::Adapter::Deploy = Deploy
     end
   end
 end

data/lib/engineyard-serverside-adapter/{disable_maintenance.rb → action/disable_maintenance.rb}

@@ -1,12 +1,14 @@
-module EY
-  module Serverside
-    class Adapter
+module EY::Serverside
+  class Adapter
+    class Action
       class DisableMaintenance < Action
 
         option :app,              :string,    :required => true
         option :account_name,     :string,    :required => true, :version => '>=2.0.0'
         option :environment_name, :string,    :required => true, :version => '>=2.0.0'
-        option :instances,        :instances, :required => true
+        option :instance_names,   :hash,      :required => true
+        option :instance_roles,   :hash,      :required => true
+        option :instances,        :array,     :required => true
         option :verbose,          :boolean
 
       private
@@ -16,6 +18,9 @@ module EY
         end
 
       end
+
+      # backwards compatibility
+      EY::Serverside::Adapter::DisableMaintenance = DisableMaintenance
     end
   end
 end

data/lib/engineyard-serverside-adapter/{enable_maintenance.rb → action/enable_maintenance.rb}

@@ -1,12 +1,14 @@
-module EY
-  module Serverside
-    class Adapter
+module EY::Serverside
+  class Adapter
+    class Action
       class EnableMaintenance < Action
 
         option :app,              :string,    :required => true
         option :account_name,     :string,    :required => true, :version => '>=2.0.0'
         option :environment_name, :string,    :required => true, :version => '>=2.0.0'
-        option :instances,        :instances, :required => true
+        option :instance_names,   :hash,      :required => true
+        option :instance_roles,   :hash,      :required => true
+        option :instances,        :array,     :required => true
         option :verbose,          :boolean
 
       private
@@ -16,6 +18,9 @@ module EY
         end
 
       end
+
+      # backwards compatibility
+      EY::Serverside::Adapter::EnableMaintenance = EnableMaintenance
     end
   end
 end

data/lib/engineyard-serverside-adapter/{integrate.rb → action/integrate.rb}

@@ -1,14 +1,17 @@
-module EY
-  module Serverside
-    class Adapter
+module EY::Serverside
+  class Adapter
+    class Action
       class Integrate < Action
 
         option :app,              :string,    :required => true
         option :account_name,     :string,    :required => true, :version => '>=2.0.0'
         option :environment_name, :string,    :required => true, :version => '>=2.0.0'
         option :stack,            :string,    :required => true
-        option :instances,        :instances, :required => true
+        option :instance_names,   :hash,      :required => true
+        option :instance_roles,   :hash,      :required => true
+        option :instances,        :array,     :required => true
         option :framework_env,    :string,    :required => true
+        option :ignore_existing,  :boolean,                      :version => '>=2.4.0'
         option :verbose,          :boolean
 
       private
@@ -18,6 +21,9 @@ module EY
         end
 
       end
+
+      # backwards compatibility
+      EY::Serverside::Adapter::Integrate = Integrate
     end
   end
 end

data/lib/engineyard-serverside-adapter/{restart.rb → action/restart.rb}

@@ -1,12 +1,14 @@
-module EY
-  module Serverside
-    class Adapter
+module EY::Serverside
+  class Adapter
+    class Action
       class Restart < Action
 
         option :app,              :string,    :required => true
         option :account_name,     :string,    :required => true, :version => '>=2.0.0'
         option :environment_name, :string,    :required => true, :version => '>=2.0.0'
-        option :instances,        :instances, :required => true
+        option :instance_names,   :hash,      :required => true
+        option :instance_roles,   :hash,      :required => true
+        option :instances,        :array,     :required => true
         option :stack,            :string,    :required => true
         option :verbose,          :boolean
 
@@ -17,6 +19,9 @@ module EY
         end
 
       end
+
+      # backwards compatibility
+      EY::Serverside::Adapter::Restart = Restart
     end
   end
 end

data/lib/engineyard-serverside-adapter/{rollback.rb → action/rollback.rb}

@@ -1,6 +1,6 @@
-module EY
-  module Serverside
-    class Adapter
+module EY::Serverside
+  class Adapter
+    class Action
       class Rollback < Action
 
         option :app,              :string,    :required => true
@@ -8,7 +8,9 @@ module EY
         option :environment_name, :string,    :required => true, :version => '>=2.0.0'
         option :config,           :json
         option :framework_env,    :string,    :required => true
-        option :instances,        :instances, :required => true
+        option :instance_names,   :hash,      :required => true
+        option :instance_roles,   :hash,      :required => true
+        option :instances,        :array,     :required => true
         option :stack,            :string,    :required => true
         option :verbose,          :boolean
 
@@ -19,6 +21,9 @@ module EY
         end
 
       end
+
+      # backwards compatibility
+      EY::Serverside::Adapter::Rollback = Rollback
     end
   end
 end

data/lib/engineyard-serverside-adapter/arguments.rb

@@ -1,14 +1,14 @@
 module EY
   module Serverside
     class Adapter
+
+      # A mutable arguments receiver that fails fast when bad values are given.
       class Arguments
 
         def self.nonempty_attr_accessor(*names)
-          names.each do |name|
-            define_method(name) do
-              instance_variable_get("@#{name}")
-            end
+          attr_reader *names
 
+          names.each do |name|
             define_method(:"#{name}=") do |value|
               if value.nil? || value.to_s.empty?
                 raise ArgumentError, "Value for '#{name}' must be non-empty."
@@ -20,10 +20,18 @@ module EY
 
         nonempty_attr_accessor :app, :account_name, :archive, :environment_name
         nonempty_attr_accessor :framework_env, :git, :ref, :stack
-        attr_accessor :clean, :config, :migrate, :serverside_version, :verbose
-        attr_reader :instances
+
+        attr_accessor :clean, :config, :migrate, :serverside_version, :verbose, :ignore_existing
+
+        attr_reader :instance_names, :instance_roles, :instances
         alias repo git # for versions where --repo is required, it is accessed via this alias
 
+        def [](key)
+          send(key)
+        end
+
+        # This is a special setter for setting all instance information at the same time.
+        # It sets @instance_roles, @instance_names and @instances.
         def instances=(instances)
           unless instances.respond_to?(:each)
             raise ArgumentError, "Value for 'instances' must look like an enumerable."
@@ -33,15 +41,22 @@ module EY
             raise ArgumentError, "Value for 'instances' must not be empty."
           end
 
-          instances.each do |instance|
+          @instance_roles = instances.inject({}) do |roles, instance|
             unless instance.respond_to?(:[]) && instance[:hostname] && instance[:roles]
               raise ArgumentError, "Malformed instance #{instance.inspect}; it must have both [:hostname] and [:roles]"
             end
+
+            roles.merge(instance[:hostname] => instance[:roles].join(','))
+          end
+
+          @instance_names = instances.inject({}) do |names, instance|
+            names.merge(instance[:hostname] => instance[:name])
           end
 
-          @instances = instances
+          @instances = instances.map{|i| i[:hostname]}
         end
 
+        # Uses Gem::Version to validate the version arg.
         def serverside_version=(value)
           if value.nil? || value.to_s.empty?
             raise ArgumentError, "Value for 'serverside_version' must be non-empty."

data/lib/engineyard-serverside-adapter/command.rb

@@ -22,6 +22,10 @@ module EY
           Escape.shell_command to_argv
         end
 
+        def argument(type, switch, value)
+          send(:"#{type}_argument", switch, value)
+        end
+
         def array_argument(switch, values)
           compacted = values.compact.sort
           if compacted.any?
@@ -41,20 +45,6 @@ module EY
           end
         end
 
-        def instances_argument(_, instances)
-          role_pairs = instances.inject({}) do |roles, instance|
-            roles.merge(instance[:hostname] => instance[:roles].join(','))
-          end
-          hash_argument('--instance-roles', role_pairs)
-
-          role_pairs = instances.inject({}) do |roles, instance|
-            roles.merge(instance[:hostname] => instance[:name])
-          end
-          hash_argument('--instance-names', role_pairs)
-
-          array_argument('--instances', instances.map{|i| i[:hostname]})
-        end
-
         def json_argument(switch, value)
           if value
             string_argument(switch, MultiJson.dump(value))

data/lib/engineyard-serverside-adapter/command_options.rb

@@ -0,0 +1,36 @@
+class EY::Serverside::Adapter::CommandOptions
+  module ClassMethods
+    def command_options
+      @options ||= EY::Serverside::Adapter::CommandOptions.new
+    end
+
+    def option(*args)
+      command_options.add(*args)
+    end
+  end
+
+  attr_accessor :options
+
+  def initialize
+    self.options = []
+  end
+
+  def add(*args)
+    option = EY::Serverside::Adapter::Option.new(*args)
+    self.options << option
+    option
+  end
+
+  def applicable(version)
+    select { |option| option.on_version?(version) }
+  end
+
+  def required(version)
+    select { |option| option.required_on_version?(version) }
+  end
+
+  def select(&block)
+    self.options.select(&block)
+  end
+
+end

data/lib/engineyard-serverside-adapter/option.rb

@@ -26,12 +26,18 @@ module EY
         end
 
         def required_on_version?(serverside_version)
+          unless on_version?(serverside_version)
+            return false
+          end
+
           case @options[:required]
           when true
             true
           when String
             requirement = Gem::Requirement.create(@options[:required])
             requirement.satisfied_by?(serverside_version)
+          else
+            false
           end
         end
 

data/lib/engineyard-serverside-adapter/version.rb

@@ -1,7 +1,7 @@
 module EY
   module Serverside
     class Adapter
-      VERSION = "2.2.2"
+      VERSION = "2.3.0"
     end
   end
 end

data/spec/integrate_spec.rb

@@ -8,6 +8,7 @@ describe EY::Serverside::Adapter::Integrate do
   it_should_behave_like "it accepts account_name"
   it_should_behave_like "it accepts framework_env"
   it_should_behave_like "it accepts instances"
+  it_should_behave_like "it accepts ignore_existing"
   it_should_behave_like "it accepts stack"
   it_should_behave_like "it accepts verbose"
   it_should_behave_like "it accepts serverside_version"
@@ -25,6 +26,7 @@ describe EY::Serverside::Adapter::Integrate do
 
   it_should_exclude_from_command :environment_name, %w[1.6.4]
   it_should_exclude_from_command :account_name,     %w[1.6.4]
+  it_should_exclude_from_command :ignore_existing,  %w[2.3.8]
 
   context "with valid arguments" do
     let(:command) do
@@ -35,6 +37,7 @@ describe EY::Serverside::Adapter::Integrate do
         arguments.instances          = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
         arguments.stack              = "nginx_unicorn"
         arguments.framework_env      = "production"
+        arguments.ignore_existing    = true
         arguments.serverside_version = serverside_version
       end
       last_command(adapter)
@@ -49,6 +52,7 @@ describe EY::Serverside::Adapter::Integrate do
         "--app rackapp",
         "--environment-name rackapp_production",
         "--framework-env production",
+        "--ignore-existing",
         "--instance-names localhost:chewie",
         "--instance-roles localhost:han,solo",
         "--instances localhost",

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'engineyard-serverside-adapter'
 require 'pp'
 
 # Default version to use in tests when one is not specified
-ENGINEYARD_SERVERSIDE_VERSION = '2.3.2'
+ENGINEYARD_SERVERSIDE_VERSION = '2.4.0'
 
 module ArgumentsHelpers
   def serverside_version
@@ -167,6 +167,25 @@ RSpec.configure do |config|
     end
   end
 
+  shared_examples_for "it accepts ignore_existing" do
+    context "the --ignore-existing arg" do
+      it "is present when you set ignore_existing to true" do
+        adapter = described_class.new(:arguments => arguments_with(:ignore_existing => true))
+        last_command(adapter).should =~ /--ignore-existing/
+      end
+
+      it "is absent when you set ignore_existing to false" do
+        adapter = described_class.new(:arguments => arguments_with(:ignore_existing => false))
+        last_command(adapter).should_not =~ /--ignore-existing/
+      end
+
+      it "is absent when you omit ignore_existing" do
+        adapter = described_class.new(:arguments => valid_arguments)
+        last_command(adapter).should_not =~ /--ignore-existing/
+      end
+    end
+  end
+
   {
     :app              => '--app',
     :environment_name => '--environment-name',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside-adapter
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Martin Emde
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -87,15 +87,16 @@ files:
 - engineyard-serverside-adapter.gemspec
 - lib/engineyard-serverside-adapter.rb
 - lib/engineyard-serverside-adapter/action.rb
+- lib/engineyard-serverside-adapter/action/deploy.rb
+- lib/engineyard-serverside-adapter/action/disable_maintenance.rb
+- lib/engineyard-serverside-adapter/action/enable_maintenance.rb
+- lib/engineyard-serverside-adapter/action/integrate.rb
+- lib/engineyard-serverside-adapter/action/restart.rb
+- lib/engineyard-serverside-adapter/action/rollback.rb
 - lib/engineyard-serverside-adapter/arguments.rb
 - lib/engineyard-serverside-adapter/command.rb
-- lib/engineyard-serverside-adapter/deploy.rb
-- lib/engineyard-serverside-adapter/disable_maintenance.rb
-- lib/engineyard-serverside-adapter/enable_maintenance.rb
-- lib/engineyard-serverside-adapter/integrate.rb
+- lib/engineyard-serverside-adapter/command_options.rb
 - lib/engineyard-serverside-adapter/option.rb
-- lib/engineyard-serverside-adapter/restart.rb
-- lib/engineyard-serverside-adapter/rollback.rb
 - lib/engineyard-serverside-adapter/version.rb
 - spec/adapter_spec.rb
 - spec/arguments_spec.rb
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: engineyard-serverside-adapter
-rubygems_version: 2.0.6
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Adapter for speaking to engineyard-serverside