engineyard-serverside-adapter 2.3.1 → 2.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGZiMmNkZjNkYmI5NDE1MmZiMWMxMWZmNjY2Y2VmM2FhZmM1ZmM3NQ==
-  data.tar.gz: !binary |-
-    NjdiNDA2M2MxZGRmNWZjOWE2YTg5NjY3ZWIxNTlhOGY3YTc1ZTRmMQ==
+SHA1:
+  metadata.gz: 27fd65e00c4cfbffdd74b28049bd13a12d1babd4
+  data.tar.gz: f97a51e9c09f0b09fa5314bacd083a1fc7c25573
 SHA512:
-  metadata.gz: !binary |-
-    OTIyYjJiNzlkNWYzOTdkN2Q1ZmExM2E2MWRmNjNmMGE1MThiOTg2NjYxOGUz
-    YmUzNDA4OGQwMjg1OTMzODlhMDNlMDg5ODk1MThhYmYwNzFmMmFkNGMxYWFk
-    MzFiMDk3MDZhODhlN2Y3ZjkxZTVjM2JjNjBhMjJkN2YxOGYyYTk=
-  data.tar.gz: !binary |-
-    MzUzY2NhMWNkOTgyOTQxOTNlOWZiNDRiMTA4Mjc2ZDZiZDM4YWUwMWI2MmUz
-    YzNjOGFiYjVjNTYwZmIzMDFkOGUzZTM3MTZmYmMxMGQ3MzU0ZjgxNDVkZGFl
-    MTdmZmZjNzkyYjczYjUxNWYyODJlY2M4N2Q5ZTVlN2ExZDlhNjc=
+  metadata.gz: ca7bbbf4d0d93bb663177c381d95f987edf66065eede3752dc211e89a2df9e225945b997a788a1f06e2dd20d119cbffad2b5d09d947819568b9e64165c4f3445
+  data.tar.gz: 5213ac42d8b9a786938619477b9d17e8969f136e7323a86af60baa60ddbfe4b97b050cd9e8e4d4bbe3e2d9f3e9305c152581cbada908e1eb02989733f7445853

data/ChangeLog.md

@@ -4,6 +4,10 @@
 
   *
 
+## v2.4.0 (2014-09-22)
+
+  * Add MaintenanceStatus action that reports maintenance page up/down.
+
 ## v2.3.1 (2014-06-10)
 
   * Fixes a bug where maintenance actions incorrectly did not accept --config options.

data/lib/engineyard-serverside-adapter.rb

@@ -13,6 +13,7 @@ module EY
       autoload :Deploy,                 'engineyard-serverside-adapter/action/deploy'
       autoload :DisableMaintenance,     'engineyard-serverside-adapter/action/disable_maintenance'
       autoload :EnableMaintenance,      'engineyard-serverside-adapter/action/enable_maintenance'
+      autoload :MaintenanceStatus,      'engineyard-serverside-adapter/action/maintenance_status'
       autoload :Integrate,              'engineyard-serverside-adapter/action/integrate'
       autoload :Restart,                'engineyard-serverside-adapter/action/restart'
       autoload :Rollback,               'engineyard-serverside-adapter/action/rollback'
@@ -36,6 +37,10 @@ module EY
         EnableMaintenance.new(new_action_args, &b)
       end
 
+      def maintenance_status(&b)
+        MaintenanceStatus.new(new_action_args, &b)
+      end
+
       def integrate(&b)
         Integrate.new(new_action_args, &b)
       end

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

@@ -10,6 +10,7 @@ module EY
         autoload :Deploy,                 'engineyard-serverside-adapter/action/deploy'
         autoload :DisableMaintenance,     'engineyard-serverside-adapter/action/disable_maintenance'
         autoload :EnableMaintenance,      'engineyard-serverside-adapter/action/enable_maintenance'
+        autoload :MaintenanceStatus,      'engineyard-serverside-adapter/action/maintenance_status'
         autoload :Integrate,              'engineyard-serverside-adapter/action/integrate'
         autoload :Restart,                'engineyard-serverside-adapter/action/restart'
         autoload :Rollback,               'engineyard-serverside-adapter/action/rollback'
@@ -35,6 +36,11 @@ module EY
           validate!
         end
 
+        def self.version_requirement(version=nil)
+          @version_requirement = Gem::Requirement.create(version) if version
+          @version_requirement
+        end
+
         def call(&block)
           commands.all? { |cmd| block.call(cmd.to_s) }
         end
@@ -124,6 +130,10 @@ module EY
             raise ArgumentError, "Required field [serverside_version] not provided."
           end
 
+          if self.class.version_requirement && !self.class.version_requirement.satisfied_by?(@serverside_version)
+            raise ArgumentError, "This command does not work with #{@serverside_version}. Version must be #{self.class.version_requirement}"
+          end
+
           missing = required_options - given_options
           unless missing.empty?
             options_s = missing.map{|option| option.name}.join(', ')

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

@@ -0,0 +1,29 @@
+module EY::Serverside
+  class Adapter
+    class Action
+      class MaintenanceStatus < Action
+
+        version_requirement '>=2.5.0'
+
+        option :app,              :string,    :required => true
+        option :account_name,     :string,    :required => true
+        option :config,           :json
+        option :environment_name, :string,    :required => true
+        option :instance_names,   :hash,      :required => true
+        option :instance_roles,   :hash,      :required => true
+        option :instances,        :array,     :required => true
+        option :verbose,          :boolean
+
+      private
+
+        def task
+          ['maintenance_status']
+        end
+
+      end
+
+      # backwards compatibility
+      EY::Serverside::Adapter::MaintenanceStatus = MaintenanceStatus
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module EY
   module Serverside
     class Adapter
-      VERSION = "2.3.1"
+      VERSION = "2.4.0"
     end
   end
 end

data/spec/maintenance_status_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe EY::Serverside::Adapter::MaintenanceStatus do
+  let(:serverside_version) { "2.5.0" }
+  it_should_behave_like "it installs engineyard-serverside"
+
+  it_should_behave_like "it accepts app"
+  it_should_behave_like "it accepts account_name"
+  it_should_behave_like "it accepts environment_name"
+  it_should_behave_like "it accepts account_name"
+  it_should_behave_like "it accepts instances"
+  it_should_behave_like "it accepts verbose"
+  it_should_behave_like "it accepts serverside_version", '2.5.1'
+
+  it_should_require :app
+  it_should_require :environment_name
+  it_should_require :account_name
+  it_should_require :instances
+  it_should_require :serverside_version
+
+  it_should_behave_like "it treats config as optional"
+
+  context "with valid arguments" do
+    let(:command) do
+      adapter = described_class.new do |arguments|
+        arguments.app                = "rackapp"
+        arguments.environment_name   = "rackapp_production"
+        arguments.account_name       = "ey"
+        arguments.instances          = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
+        arguments.serverside_version = serverside_version
+      end
+      last_command(adapter)
+    end
+
+    it "invokes exactly the right command" do
+      command.should == [
+        "engineyard-serverside",
+        "_#{serverside_version}_",
+        "maintenance_status",
+        "--account-name ey",
+        "--app rackapp",
+        "--environment-name rackapp_production",
+        "--instance-names localhost:chewie",
+        "--instance-roles localhost:han,solo",
+        "--instances localhost",
+      ].join(' ')
+    end
+
+    it "blows up if serverside version is too old" do
+      expect do
+        described_class.new do |arguments|
+          arguments.app                = "rackapp"
+          arguments.environment_name   = "rackapp_production"
+          arguments.account_name       = "ey"
+          arguments.instances          = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
+          arguments.serverside_version = "2.4.0"
+        end
+      end.to raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -233,10 +233,11 @@ RSpec.configure do |config|
     end
   end
 
-  shared_examples_for "it accepts serverside_version" do
+  shared_examples_for "it accepts serverside_version" do |*args|
     it "puts the _VERSION_ command part in the command line" do
-      adapter = described_class.new(:arguments => arguments_with(:serverside_version => '1.2.3'))
-      last_command(adapter).should =~ /engineyard-serverside _1.2.3_/
+      version = args[0] || '1.2.3' # ruby 1.8.7 does not allow for default values of block variables
+      adapter = described_class.new(:arguments => arguments_with(:serverside_version => version))
+      last_command(adapter).should =~ /engineyard-serverside _#{version}_/
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside-adapter
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Martin Emde
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A separate adapter for speaking the CLI language of the engineyard-serverside
@@ -76,8 +76,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - ChangeLog.md
 - Gemfile
 - Guardfile
@@ -91,6 +91,7 @@ files:
 - 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/maintenance_status.rb
 - lib/engineyard-serverside-adapter/action/restart.rb
 - lib/engineyard-serverside-adapter/action/rollback.rb
 - lib/engineyard-serverside-adapter/arguments.rb
@@ -104,6 +105,7 @@ files:
 - spec/disable_maintenance_spec.rb
 - spec/enable_maintenance_spec.rb
 - spec/integrate_spec.rb
+- spec/maintenance_status_spec.rb
 - spec/restart_spec.rb
 - spec/rollback_spec.rb
 - spec/spec_helper.rb
@@ -117,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: engineyard-serverside-adapter
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adapter for speaking to engineyard-serverside