engineyard 1.3.20 → 1.3.21

data/README.rdoc

@@ -1,5 +1,24 @@
 = ey
 
+== Login
+
+The first command you run will notice that you are not logged in and will ask you for your AppCloud email and password.
+
+== Configuration
+
+The ey.yml file allows options to be saved for each environment to which an application is deployed. Here's an example ey.yml file in RAILS_ROOT/config/ey.yml:
+
+    $ cat config/ey.yml
+    ---
+    environments:
+      env_production:
+        migrate: false
+        migration_command: rake fancy:migrate
+        branch: deploy
+
+This ey.yml file wile turn off default migrations, set the default command to "rake fancy:migrate" and set the default deploy branch to "deploy".
+
+== Commands
 
 Command:
   ey deploy
@@ -17,11 +36,15 @@ Command:
 
 
   Description:
-    This command must be run with the current directory containing the app to be deployed. If ey.yml specifies a default branch then the ref parameter can be omitted. Furthermore,
-    if a default branch is specified but a different command is supplied the deploy will fail unless --ignore-default-branch is used.
-
-    Migrations are run by default with 'rake db:migrate'. A different command can be specified via --migrate "ruby do_migrations.rb". Migrations can also be skipped entirely by
-    using --no-migrate.
+    This command must be run with the current directory containing the app to be
+    deployed. If ey.yml specifies a default branch then the ref parameter can be
+    omitted. Furthermore, if a default branch is specified but a different
+    command is supplied the deploy will fail unless --ignore-default-branch
+    is used.
+
+    Migrations are run by default with 'rake db:migrate'. A different command
+    can be specified via --migrate "ruby do_migrations.rb". Migrations can also
+    be skipped entirely by using --no-migrate.
 
 Command:
   ey environments

data/lib/engineyard-api-client.rb

@@ -0,0 +1,135 @@
+require 'engineyard/model'
+
+module EngineYard
+  class APIClient
+    attr_reader :token
+
+    USER_AGENT_STRING = "EngineYardAPIClient/#{VERSION}"
+
+    def initialize(token = nil)
+      @token ||= token
+      @token ||= self.class.read_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 ||= Environment.from_array(request('/environments')["environments"], :api => self)
+    end
+
+    def apps
+      @apps ||= 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
+
+    class InvalidCredentials < EY::AppCloudClient::Error; end
+    class RequestFailed < EY::AppCloudClient::Error; end
+
+    def self.request(path, opts={})
+      require 'rest_client'
+      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 RequestFailed, "The requested resource could not be found"
+      rescue RestClient::BadGateway
+        raise RequestFailed, "AppCloud 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"]
+      save_token(api_token)
+      api_token
+    end
+
+    def self.read_token(file = nil)
+      file ||= ENV['EYRC'] || File.expand_path("~/.eyrc")
+      return false unless File.exists?(file)
+
+      require 'yaml'
+
+      data = YAML.load_file(file)
+      if EY.config.default_endpoint?
+        data["api_token"]
+      else
+        (data[EY.config.endpoint.to_s] || {})["api_token"]
+      end
+    end
+
+    def self.save_token(token, file = nil)
+      file ||= ENV['EYRC'] || File.expand_path("~/.eyrc")
+      require 'yaml'
+
+      data = File.exists?(file) ? YAML.load_file(file) : {}
+      if EY.config.default_endpoint?
+        data.merge!("api_token" => token)
+      else
+        data.merge!(EY.config.endpoint.to_s => {"api_token" => token})
+      end
+
+      File.open(file, "w"){|f| YAML.dump(data, f) }
+      true
+    end
+
+  end # API
+end # EY

data/lib/engineyard/cli.rb

@@ -122,7 +122,7 @@ module EY
           message << "The following environments contain those applications:\n\n"
           EY.ui.warn(message)
         elsif apps.empty?
-          EY.ui.warn(NoAppError.new(repo).message)
+          EY.ui.warn(NoAppError.new(repo).message + "\nUse #{self.class.send(:banner_base)} environments --all to see all environments.")
         end
 
         EY.ui.print_envs(apps, EY.config.default_environment, options[:simple])

data/lib/engineyard/collection/abstract.rb

@@ -11,9 +11,9 @@ Specify --account ACCOUNT_NAME to resolve this ambiguity.
       def named(name, account_name=nil)
         candidates = find_all do |x|
           if account_name
-            x.name == name && x.account.name == account_name
+            x.name.downcase == name.downcase && x.account.name.downcase == account_name.downcase
           else
-            x.name == name
+            x.name.downcase == name.downcase
           end
         end
         if candidates.size > 1
@@ -33,7 +33,7 @@ Specify --account ACCOUNT_NAME to resolve this ambiguity.
     private
 
       def find_by_unambiguous_substring(name_part)
-        candidates = find_all{|e| e.name[name_part] }
+        candidates = find_all{|e| e.name.downcase[name_part.downcase] }
         if candidates.size > 1
           raise ambiguous_error(name_part, candidates.map {|e| e.name})
         end

data/lib/engineyard/model/environment.rb

@@ -83,7 +83,7 @@ module EY
       def upload_recipes_at_path(recipes_path)
         recipes_path = Pathname.new(recipes_path)
         if recipes_path.exist?
-          upload_recipes recipes_path.open('r')
+          upload_recipes recipes_path.open('rb')
         else
           raise EY::Error, "Recipes file not found: #{recipes_path}"
         end

data/lib/engineyard/resolver.rb

@@ -64,7 +64,7 @@ module EY
         message = "Multiple app deployments possible, please be more specific:\n\n"
         candidates.map{|c| [c[:account_name], c[:app_name]]}.uniq.each do |account_name, app_name|
           message << "#{app_name}\n"
-          candidates.select {|x| x[:app_name] == app_name && x[:account_name] == account_name}.map{|x| x[:environment_name]}.uniq.each do |env_name|
+          candidates.select {|c| c[:app_name] == app_name && c[:account_name] == account_name}.map{|c| c[:environment_name]}.uniq.each do |env_name|
             message << "\t#{env_name} # ey <command> --environment='#{env_name}' --app='#{app_name}' --account='#{account_name}'\n"
           end
         end
@@ -80,10 +80,10 @@ module EY
       @app_deployments ||= api.apps.map do |app|
         app.environments.map do |environment|
           { 
-            :app_name => app.name,
+            :app_name => app.name.downcase,
             :repository_uri => app.repository_uri,
-            :environment_name => environment.name,
-            :account_name => app.account.name,
+            :environment_name => environment.name.downcase,
+            :account_name => app.account.name.downcase,
           }
         end
       end.flatten
@@ -122,10 +122,10 @@ module EY
     end
 
     def filter_candidates_by(type, options, candidates)
-      if options[type] && candidates.any?{|c| c[type] == options[type] }
-        candidates.select {|c| c[type] == options[type] }
+      if options[type] && candidates.any?{|c| c[type] == options[type].downcase }
+        candidates.select {|c| c[type] == options[type].downcase }
       elsif options[type]
-        candidates.select {|c| c[type][options[type]] }
+        candidates.select {|c| c[type][options[type].downcase] }
       else
         candidates
       end

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.20'
+  VERSION = '1.3.21'
 end

data/spec/engineyard/resolver_spec.rb

@@ -95,6 +95,11 @@ describe EY::Resolver do
       resolver.app_and_environment(:repo => repo("git://github.com/repo/app.git"), :environment_name => "staging").should resolve_to(@staging)
     end
 
+    it "doesn't care about case" do
+      resolver.app_and_environment(:account_name => "EY", :app_name => "big").should resolve_to(@big)
+      resolver.app_and_environment(:account_name => "ey", :app_name => "BiG").should resolve_to(@big)
+    end
+
     it "returns the match when an app is specified even when there is a repo" do
       resolver.app_and_environment(:account_name => "ey", :app_name => "bigapp", :repo => repo("git://github.com/repo/app.git")).should resolve_to(@big)
     end

data/spec/ey/list_environments_spec.rb

@@ -4,41 +4,53 @@ describe "ey environments" do
 
   given "integration"
 
-  before(:all) do
-    api_scenario "one app, many environments"
-  end
+  context "with no apps" do
+    before do
+      api_scenario "empty"
+    end
 
-  it "lists the environments your app is in" do
-    ey %w[environments]
-    @out.should include('rails232app (main)')
-    @out.should =~ /giblets/
-    @out.should =~ /bakon/
+    it "suggests that you use environments --all" do
+      ey %w[environments]
+      @out.should =~ /Use ey environments --all to see all environments./
+    end
   end
 
-  it "reports failure to find a git repo when not in one" do
-    Dir.chdir("/tmp") do
-      ey %w[environments], :expect_failure => true
-      @err.should =~ /fatal: No git remotes found in .*\/tmp/
-      @out.should_not =~ /no application configured/
+  context "with apps" do
+    before(:all) do
+      api_scenario "one app, many environments"
     end
-  end
 
-  it "lists all environments that have apps with -a" do
-    ey %w[environments -a]
-    @out.should include("bakon")
-    @out.should include("giblets")
-  end
+    it "lists the environments your app is in" do
+      ey %w[environments]
+      @out.should include('rails232app (main)')
+      @out.should =~ /giblets/
+      @out.should =~ /bakon/
+    end
 
-  it "outputs simply with -s" do
-    ey %w[environments -s], :debug => false
-    @out.split(/\n/).sort.should == ["bakon", "giblets"]
-  end
+    it "reports failure to find a git repo when not in one" do
+      Dir.chdir("/tmp") do
+        ey %w[environments], :expect_failure => true
+        @err.should =~ /fatal: No git remotes found in .*\/tmp/
+        @out.should_not =~ /no application configured/
+      end
+    end
 
-  it "outputs all environments (including ones with no apps) simply with -a and -s" do
-    ey %w[environments -a -s], :debug => false
-    @out.split(/\n/).sort.should == ["bakon", "beef", "giblets"]
-  end
+    it "lists all environments that have apps with -a" do
+      ey %w[environments -a]
+      @out.should include("bakon")
+      @out.should include("giblets")
+    end
 
+    it "outputs simply with -s" do
+      ey %w[environments -s], :debug => false
+      @out.split(/\n/).sort.should == ["bakon", "giblets"]
+    end
+
+    it "outputs all environments (including ones with no apps) simply with -a and -s" do
+      ey %w[environments -a -s], :debug => false
+      @out.split(/\n/).sort.should == ["bakon", "beef", "giblets"]
+    end
+  end
 end
 
 describe "ey environments with an ambiguous git repo" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 1
   - 3
-  - 20
-  version: 1.3.20
+  - 21
+  version: 1.3.21
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 -07:00
+date: 2011-08-03 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,12 +102,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 1
         - 4
-        - 1
-        version: 1.4.1
+        - 2
+        version: 1.4.2
   name: engineyard-serverside-adapter
   prerelease: false
   type: :runtime
@@ -297,6 +297,7 @@ files:
 - lib/engineyard/ruby_ext.rb
 - lib/engineyard/thor.rb
 - lib/engineyard/version.rb
+- lib/engineyard-api-client.rb
 - lib/engineyard.rb
 - LICENSE
 - README.rdoc