engineyard 1.3.12 → 1.3.13

data/lib/engineyard/model/deployment.rb

@@ -42,7 +42,7 @@ module EY
       def update_with_response(response)
         data = response['deployment']
         data.each do |key,val|
-          self[key] = val if members.include?(key)
+          self.send("#{key}=", val) if respond_to?("#{key}=")
         end
       end
 

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.12'
+  VERSION = '1.3.13'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 3
-  - 12
-  version: 1.3.12
+  - 13
+  version: 1.3.13
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -30,9 +30,9 @@ dependencies:
         - 14
         - 6
         version: 0.14.6
+  requirement: *id001
   name: thor
   prerelease: false
-  requirement: *id001
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
@@ -40,15 +40,15 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 1
-        - 4
-        - 2
-        version: 1.4.2
+        - 6
+        - 0
+        version: 1.6.0
+  requirement: *id002
   name: rest-client
   prerelease: false
-  requirement: *id002
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
@@ -62,9 +62,9 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
+  requirement: *id003
   name: highline
   prerelease: false
-  requirement: *id003
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
@@ -76,9 +76,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
   name: json_pure
   prerelease: false
-  requirement: *id004
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
@@ -92,9 +92,9 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
+  requirement: *id005
   name: escape
   prerelease: false
-  requirement: *id005
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
@@ -108,9 +108,9 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
+  requirement: *id006
   name: engineyard-serverside-adapter
   prerelease: false
-  requirement: *id006
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
@@ -124,9 +124,9 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
+  requirement: *id007
   name: open4
   prerelease: false
-  requirement: *id007
   type: :runtime
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.
 email: cloud@engineyard.com
@@ -149,7 +149,6 @@ files:
 - lib/engineyard/collection/environments.rb
 - lib/engineyard/collection.rb
 - lib/engineyard/config.rb
-- lib/engineyard/connection/system.rb
 - lib/engineyard/error.rb
 - lib/engineyard/model/account.rb
 - lib/engineyard/model/api_struct.rb

data/lib/engineyard/connection/system.rb

@@ -1,96 +0,0 @@
-require 'escape'
-
-module EY
-  module Connection
-    class System
-      def adapter(app, instances, verbose)
-        require 'engineyard-serverside-adapter'
-        EY::Serverside::Adapter.new("/usr/local/ey_resin/ruby/bin") do |args|
-          args.app           = app.name
-          args.repo          = app.repository_uri
-          args.instances     = instances
-          args.verbose       = verbose || ENV['DEBUG']
-        end
-      end
-      private :adapter
-
-      def deploy(app, ref, instances, stack_name, framework_env, migration_command=nil, extra_configuration=nil, verbose=false)
-        deploy_command = adapter(app, instances, verbose).deploy do |args|
-          args.ref           = ref
-          args.stack         = stack_name
-          args.framework_env = framework_env
-          args.migrate       = migration_command if migration_command
-          args.config        = extra_configuration if extra_configuration
-        end
-
-        invoke deploy_command
-      end
-
-      def rollback(app, instances, stack_name, framework_env, extra_configuration=nil, verbose=false)
-        rollback = adapter(app, instances, verbose).rollback do |args|
-          args.stack         = stack_name
-          args.framework_env = framework_env
-          args.config        = extra_configuration if extra_configuration
-        end
-        invoke rollback
-      end
-
-
-      def put_up_maintenance_page(app, instances, verbose=false)
-        invoke adapter(app, instances, verbose).enable_maintenance_page
-      end
-
-      def take_down_maintenance_page(app, instances, verbose=false)
-        invoke adapter(app, instances, verbose).disable_maintenance_page
-      end
-
-    protected
-
-      def engineyard_serverside_hostname
-        # If we tell engineyard-serverside to use 'localhost', it'll run
-        # commands on the instance directly (#system). If we give it the
-        # instance's actual hostname, it'll SSH to itself.
-        #
-        # Using 'localhost' instead of its EC2 hostname speeds up
-        # deploys on solos and single-app-server clusters significantly.
-        app_master? ? 'localhost' : hostname
-      end
-
-    private
-
-      def ssh(remote_command, output = true)
-        user = environment.username
-
-        cmd = Escape.shell_command(%w[ssh -o StrictHostKeyChecking=no -q] << "#{user}@#{hostname}" << remote_command)
-        cmd << " > /dev/null" unless output
-        EY.ui.debug(cmd)
-        unless ENV["NO_SSH"]
-          system cmd
-        else
-          true
-        end
-      end
-
-      def invoke(action)
-        action.call do |cmd|
-          puts cmd if action.verbose
-          ssh cmd
-        end
-      end
-
-      def instances_data
-        environment.instances.select { |inst| inst.has_app_code? }.map do |i|
-          {
-            :hostname => i.engineyard_serverside_hostname,
-            :roles    => [i.role],
-            :name     => i.name,
-          }
-        end
-      end
-
-      def app_master?
-        environment.app_master == self
-      end
-    end
-  end
-end