engineyard 1.2.0 → 1.2.1

data/lib/engineyard.rb

@@ -1,6 +1,7 @@
 module EY
   require 'engineyard/ruby_ext'
   require 'engineyard/version'
+  require 'engineyard/serverside_version'
 
   autoload :API,        'engineyard/api'
   autoload :Collection, 'engineyard/collection'

data/lib/engineyard/api.rb

@@ -43,7 +43,7 @@ module EY
 
     def self.request(path, opts={})
       require 'rest_client'
-      require 'json'
+      require 'json/pure'
 
       url = EY.config.endpoint + "api/v2#{path}"
       method = ((meth = opts.delete(:method)) && meth.to_s || "get").downcase.to_sym

data/lib/engineyard/model/environment.rb

@@ -43,7 +43,7 @@ module EY
         # true means migrate w/custom command (if present) or default
         # a string means migrate with this specific command
 
-        default_migration_command = config['migration_command'] || 'rake db:migrate'
+        default_migration_command = config['migration_command'] || 'rake db:migrate --trace'
 
         migration_from_config = if config.has_key?('migrate')
                                   if config['migrate']

data/lib/engineyard/model/instance.rb

@@ -3,7 +3,6 @@ require 'escape'
 module EY
   module Model
     class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment)
-      ENGINEYARD_SERVERSIDE_VERSION = ENV["ENGINEYARD_SERVERSIDE_VERSION"] || "1.2.0"
       EXIT_STATUS = Hash.new { |h,k| raise EY::Error, "engineyard-serverside version checker exited with unknown status code #{k}" }
       EXIT_STATUS.merge!({
         255 => :ssh_failed,

data/lib/engineyard/serverside_version.rb

@@ -0,0 +1,3 @@
+module EY
+  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '1.2.1'
+end

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/ey/deploy_spec.rb

@@ -89,7 +89,7 @@ describe "ey deploy" do
     it "defaults to 'rake db:migrate'" do
       ey "deploy"
       @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
-      @ssh_commands.last.should =~ /--migrate 'rake db:migrate'/
+      @ssh_commands.last.should =~ /--migrate 'rake db:migrate --trace'/
     end
 
     it "can be disabled with --no-migrate" do
@@ -100,7 +100,7 @@ describe "ey deploy" do
 
     it "uses the default when --migrate is specified with no value" do
       ey "deploy --migrate"
-      @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
+      @ssh_commands.last.should match(/--migrate 'rake db:migrate --trace'/)
     end
 
     context "customized in ey.yml" do
@@ -132,7 +132,7 @@ describe "ey deploy" do
 
       it "migrates with the default when --migrate is specified with no value" do
         ey "deploy --migrate"
-        @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
+        @ssh_commands.last.should match(/--migrate 'rake db:migrate --trace'/)
       end
     end
 
@@ -142,7 +142,7 @@ describe "ey deploy" do
 
       it "migrates with the default" do
         ey "deploy"
-        @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
+        @ssh_commands.last.should match(/--migrate 'rake db:migrate --trace'/)
       end
     end
 

data/spec/support/shared_behavior.rb

@@ -187,7 +187,7 @@ shared_examples_for "it invokes engineyard-serverside" do
     it "does not try to install engineyard-serverside if it's already there" do
       run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(0)}})
       @ssh_commands.should_not have_command_like(/gem install engineyard-serverside/)
-      ver = Regexp.quote(EY::Model::Instance::ENGINEYARD_SERVERSIDE_VERSION)
+      ver = Regexp.quote(EY::ENGINEYARD_SERVERSIDE_VERSION)
       @ssh_commands.should have_command_like(/engineyard-serverside _#{ver}_ deploy/)
     end
   end  

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,90 +15,100 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -07:00
+date: 2010-08-25 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
   requirement: *id001
-  prerelease: false
-  name: termios
   type: :runtime
+  name: highline
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 39
         segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+        - 0
+        - 14
+        - 0
+        version: 0.14.0
   requirement: *id002
-  prerelease: false
-  name: highline
   type: :runtime
+  name: thor
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        - 14
-        - 0
-        version: 0.14.0
+        version: "0"
   requirement: *id003
-  prerelease: false
-  name: thor
   type: :runtime
+  name: ruby-termios
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 0
         - 4
         version: 0.0.4
   requirement: *id004
-  prerelease: false
-  name: escape
   type: :runtime
+  name: escape
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
-        - 0
-        version: 1.4.0
+        version: "1.4"
   requirement: *id005
-  prerelease: false
-  name: json
   type: :runtime
+  name: rest-client
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 1
-        - 4
-        version: "1.4"
+        - 0
+        version: "0"
   requirement: *id006
-  prerelease: false
-  name: rest-client
   type: :runtime
+  name: json_pure
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.
 email: cloud@engineyard.com
 executables: 
@@ -120,7 +131,6 @@ files:
 - lib/engineyard/collection.rb
 - lib/engineyard/config.rb
 - lib/engineyard/error.rb
-- lib/engineyard/model/#app.rb#
 - lib/engineyard/model/api_struct.rb
 - lib/engineyard/model/app.rb
 - lib/engineyard/model/environment.rb
@@ -129,13 +139,44 @@ files:
 - lib/engineyard/model.rb
 - lib/engineyard/repo.rb
 - lib/engineyard/ruby_ext.rb
+- lib/engineyard/serverside_version.rb
 - lib/engineyard/thor.rb
 - lib/engineyard/version.rb
 - lib/engineyard.rb
 - LICENSE
 - README.rdoc
+- spec/engineyard/api_spec.rb
+- spec/engineyard/cli/api_spec.rb
+- spec/engineyard/cli_spec.rb
+- spec/engineyard/collection/apps_spec.rb
+- spec/engineyard/collection/environments_spec.rb
+- spec/engineyard/config_spec.rb
+- spec/engineyard/model/api_struct_spec.rb
+- spec/engineyard/model/environment_spec.rb
+- spec/engineyard/model/instance_spec.rb
+- spec/engineyard/repo_spec.rb
+- spec/engineyard_spec.rb
+- spec/ey/deploy_spec.rb
+- spec/ey/ey_spec.rb
+- spec/ey/list_environments_spec.rb
+- spec/ey/logs_spec.rb
+- spec/ey/rebuild_spec.rb
+- spec/ey/recipes/apply_spec.rb
+- spec/ey/recipes/download_spec.rb
+- spec/ey/recipes/upload_spec.rb
+- spec/ey/rollback_spec.rb
+- spec/ey/ssh_spec.rb
+- spec/ey/web/disable_spec.rb
+- spec/ey/web/enable_spec.rb
+- spec/spec_helper.rb
+- spec/support/bundled_ey
+- spec/support/fake_awsm.ru
+- spec/support/git_repo.rb
+- spec/support/helpers.rb
+- spec/support/ruby_ext.rb
+- spec/support/shared_behavior.rb
 has_rdoc: true
-homepage: http://engineyard.com
+homepage: http://github.com/engineyard/engineyard
 licenses: []
 
 post_install_message: 
@@ -144,23 +185,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud

data/lib/engineyard/model/#app.rb#

@@ -1,23 +0,0 @@
-bmodule EY
-  module Model
-    class App < ApiStruct.new(:name, :repository_uri, :environments, :api)
-
-      def self.from_hash(hash)
-        super.tap do |app|
-          app.environments = Environment.from_array(app.environments, :api => app.api)
-        end
-      end
-
-      def sole_environment
-        if environments.size == 1
-          environments.first
-        end
-      end
-
-      def sole_environment!
-        sole_environment or raise NoSingleEnvironmentError.new(self)
-      end
-
-    end
-  end
-end