engineyard 1.4.29 → 1.7.0.pre2

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 1.4.29
-  prerelease: 
+  version: 1.7.0.pre2
+  prerelease: 6
 platform: ruby
 authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 1.7.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,23 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 1.7.0.pre2
+- !ruby/object:Gem::Dependency
+  name: engineyard-cloud-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +267,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: hashie
+  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: gitable
+  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: This gem allows you to deploy your rails application to the Engine Yard
   cloud directly from the command line.
 email: cloud@engineyard.com
@@ -260,32 +308,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/ey
-- lib/engineyard/api.rb
+- lib/engineyard/cli/#recipes.rb#
 - lib/engineyard/cli/api.rb
 - lib/engineyard/cli/recipes.rb
 - lib/engineyard/cli/ui.rb
 - lib/engineyard/cli/web.rb
 - lib/engineyard/cli.rb
-- lib/engineyard/collection/abstract.rb
-- lib/engineyard/collection/apps.rb
-- lib/engineyard/collection/environments.rb
-- lib/engineyard/collection.rb
 - lib/engineyard/config.rb
+- lib/engineyard/deploy_config/migrate.rb
+- lib/engineyard/deploy_config/ref.rb
+- lib/engineyard/deploy_config.rb
 - lib/engineyard/error.rb
 - lib/engineyard/eyrc.rb
-- lib/engineyard/model/account.rb
-- lib/engineyard/model/api_struct.rb
-- lib/engineyard/model/app.rb
-- lib/engineyard/model/deployment.rb
-- lib/engineyard/model/environment.rb
-- lib/engineyard/model/instance.rb
-- lib/engineyard/model/log.rb
-- lib/engineyard/model/user.rb
-- lib/engineyard/model.rb
 - lib/engineyard/repo.rb
-- lib/engineyard/resolver.rb
-- lib/engineyard/rest_client_ext.rb
-- lib/engineyard/ruby_ext.rb
+- lib/engineyard/serverside_runner.rb
 - lib/engineyard/thor.rb
 - lib/engineyard/version.rb
 - lib/engineyard.rb
@@ -322,18 +358,12 @@ files:
 - lib/vendor/thor/README.md
 - 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/deploy_config_spec.rb
 - spec/engineyard/eyrc_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/resolver_spec.rb
 - spec/engineyard_spec.rb
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb
@@ -353,13 +383,11 @@ files:
 - spec/ey/whoami_spec.rb
 - spec/spec_helper.rb
 - spec/support/bundled_ey
-- spec/support/fake_awsm.rb
-- spec/support/fake_awsm.ru
 - spec/support/fixture_recipes.tgz
+- spec/support/git_repos.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb
 - spec/support/ruby_ext.rb
-- spec/support/scenarios.rb
 - spec/support/shared_behavior.rb
 homepage: http://github.com/engineyard/engineyard
 licenses: []
@@ -377,37 +405,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1428275579656453784
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1428275579656453784
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud
 test_files:
-- 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/deploy_config_spec.rb
 - spec/engineyard/eyrc_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/resolver_spec.rb
 - spec/engineyard_spec.rb
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb
@@ -427,11 +443,9 @@ test_files:
 - spec/ey/whoami_spec.rb
 - spec/spec_helper.rb
 - spec/support/bundled_ey
-- spec/support/fake_awsm.rb
-- spec/support/fake_awsm.ru
 - spec/support/fixture_recipes.tgz
+- spec/support/git_repos.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb
 - spec/support/ruby_ext.rb
-- spec/support/scenarios.rb
 - spec/support/shared_behavior.rb

data/lib/engineyard/api.rb

@@ -1,117 +0,0 @@
-require 'engineyard/model'
-require 'yaml'
-require 'rest_client'
-require 'engineyard/rest_client_ext'
-require 'json'
-require 'engineyard/eyrc'
-
-module EY
-  class API
-    attr_reader :token
-
-    USER_AGENT_STRING = "EngineYardCLI/#{VERSION}"
-
-    def initialize(token = nil)
-      @token = token
-      @token ||= EY::EYRC.load.api_token
-      raise ArgumentError, "EY Cloud API token required" unless @token
-    end
-
-    def ==(other)
-      raise ArgumentError unless other.is_a?(self.class)
-      self.token == other.token
-    end
-
-    def request(url, opts={})
-      opts[:headers] ||= {}
-      opts[:headers]["X-EY-Cloud-Token"] = token
-      EY.ui.debug("Token", token)
-      self.class.request(url, opts)
-    end
-
-    def environments
-      @environments ||= EY::Model::Environment.from_array(request('/environments')["environments"], :api => self)
-    end
-
-    def apps
-      @apps ||= EY::Model::App.from_array(request('/apps')["apps"], :api => self)
-    end
-
-    def resolver
-      @resolver ||= Resolver.new(self)
-    end
-
-    def apps_for_repo(repo)
-      repo.fail_on_no_remotes!
-      apps.find_all {|a| repo.has_remote?(a.repository_uri) }
-    end
-
-    def user
-      EY::Model::User.from_hash(request('/current_user')['user'])
-    end
-
-    class InvalidCredentials < EY::Error; end
-    class RequestFailed < EY::Error; end
-    class ResourceNotFound < RequestFailed; end
-
-    def self.request(path, opts={})
-      require 'rest_client'
-      require 'engineyard/rest_client_ext'
-      require 'json'
-
-      url = EY.config.endpoint + "api/v2#{path}"
-      method = (opts.delete(:method) || 'get').to_s.downcase.to_sym
-      params = opts.delete(:params) || {}
-      headers = opts.delete(:headers) || {}
-      headers["Accept"] ||= "application/json"
-      headers["User-Agent"] = USER_AGENT_STRING
-
-      begin
-        EY.ui.debug("Request", "#{method.to_s.upcase} #{url}")
-        case method
-        when :get, :delete, :head
-          url.query = RestClient::Payload::UrlEncoded.new(params).to_s
-          resp = RestClient.send(method, url.to_s, headers)
-        else
-          resp = RestClient.send(method, url.to_s, params, headers)
-        end
-      rescue RestClient::Unauthorized
-        raise InvalidCredentials
-      rescue Errno::ECONNREFUSED
-        raise RequestFailed, "Could not reach the cloud API"
-      rescue RestClient::ResourceNotFound
-        raise ResourceNotFound, "The requested resource could not be found"
-      rescue RestClient::BadGateway
-        raise RequestFailed, "EY Cloud API is temporarily unavailable. Please try again soon."
-      rescue RestClient::RequestFailed => e
-        raise RequestFailed, "#{e.message} #{e.response}"
-      rescue OpenSSL::SSL::SSLError
-        raise RequestFailed, "SSL is misconfigured on your cloud"
-      end
-
-      if resp.body.empty?
-        data = ''
-      elsif resp.headers[:content_type] =~ /application\/json/
-        begin
-          data = JSON.parse(resp.body)
-          EY.ui.debug("Response", data)
-        rescue JSON::ParserError
-          EY.ui.debug("Raw response", resp.body)
-          raise RequestFailed, "Response was not valid JSON."
-        end
-      else
-        data = resp.body
-      end
-
-      data
-    end
-
-    def self.fetch_token(email, password)
-      api_token = request("/authenticate", :method => "post",
-        :params => { :email => email, :password => password })["api_token"]
-      EY::EYRC.load.api_token = api_token
-      api_token
-    end
-
-  end # API
-end # EY

data/lib/engineyard/collection.rb

@@ -1,7 +0,0 @@
-module EY
-  module Collection
-    require 'engineyard/collection/abstract'
-    require 'engineyard/collection/environments'
-    require 'engineyard/collection/apps'
-  end
-end

data/lib/engineyard/collection/abstract.rb

@@ -1,71 +0,0 @@
-require 'engineyard/error'
-
-module EY
-  module Collection
-    class Abstract
-      COLLAB_MESSAGE = <<-MSG
-\nThis error is due to having access to another account's resources via the collaboration feature.
-Specify --account ACCOUNT_NAME to resolve this ambiguity.
-      MSG
-
-      include Enumerable
-
-      def initialize(contents)
-        @contents = contents ? contents.dup.flatten : []
-      end
-
-      def each(&block)
-        @contents.each(&block)
-      end
-
-      def to_a
-        @contents
-      end
-
-      def named(name, account_name=nil)
-        candidates = @contents.find_all do |x|
-          if account_name
-            x.name.downcase == name.downcase && x.account.name.downcase == account_name.downcase
-          else
-            x.name.downcase == name.downcase
-          end
-        end
-        if candidates.size > 1
-          raise ambiguous_error(name, candidates.map {|e| e.name}, COLLAB_MESSAGE )
-        end
-        candidates.first
-      end
-
-      def match_one(name_part)
-        named(name_part) || find_by_unambiguous_substring(name_part)
-      end
-
-      def match_one!(name_part)
-        match_one(name_part) or raise invalid_error(name_part)
-      end
-
-    private
-
-      def find_by_unambiguous_substring(name_part)
-        candidates = @contents.find_all{|e| e.name.downcase[name_part.downcase] }
-        if candidates.size > 1
-          raise ambiguous_error(name_part, candidates.map {|e| e.name})
-        end
-        candidates.first
-      end
-
-      class << self
-        attr_accessor :invalid_error, :ambiguous_error
-      end
-
-      def invalid_error(*args, &blk)
-        self.class.invalid_error.new(*args, &blk)
-      end
-
-      def ambiguous_error(*args, &blk)
-        self.class.ambiguous_error.new(*args, &blk)
-      end
-
-    end
-  end
-end

data/lib/engineyard/collection/apps.rb

@@ -1,8 +0,0 @@
-module EY
-  module Collection
-    class Apps < Abstract
-      self.invalid_error = InvalidAppError
-      self.ambiguous_error = AmbiguousAppNameError
-    end
-  end
-end

data/lib/engineyard/collection/environments.rb

@@ -1,8 +0,0 @@
-module EY
-  module Collection
-    class Environments < Abstract
-      self.invalid_error = NoEnvironmentError
-      self.ambiguous_error = AmbiguousEnvironmentNameError
-    end
-  end
-end

data/lib/engineyard/model.rb

@@ -1,12 +0,0 @@
-module EY
-  module Model
-    require 'engineyard/model/api_struct'
-    require 'engineyard/model/account'
-    require 'engineyard/model/app'
-    require 'engineyard/model/deployment'
-    require 'engineyard/model/environment'
-    require 'engineyard/model/log'
-    require 'engineyard/model/instance'
-    require 'engineyard/model/user'
-  end
-end