engineyard 1.3.22 → 1.3.25

data/README.rdoc

@@ -171,3 +171,13 @@ Command:
     Note: this command is a bit picky about its ordering. To run a command with arguments on all servers, like "rm -f /some/file", you need to order it like so:
 
     $ ey ssh "rm -f /some/file" -e my-environment --all
+
+Command:
+  ey launch
+
+  Options:
+    -e, [--environment=ENVIRONMENT]  # Environment to ssh into
+    -c, [--account=ACCOUNT]          # Name of the account in which the environment can be found
+
+  Description:
+    Open the application in a browser.

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

@@ -68,6 +68,7 @@ module EY
 
       if environment.deploy(app, deploy_ref, deploy_options)
         EY.ui.info "Deploy complete"
+        EY.ui.info "Now you can run `ey launch' to open the application in a browser."
       else
         raise EY::Error, "Deploy failed"
       end
@@ -331,5 +332,15 @@ module EY
       end
     end
 
+    desc "launch [--environment ENVIRONMENT] [--account ACCOUNT]", "Open application in browser."
+    method_option :environment, :type => :string, :aliases => %w(-e),
+      :desc => "Environment with the interesting logs"
+    method_option :account, :type => :string, :aliases => %w(-c),
+      :desc => "Name of the account in which the environment can be found"
+    def launch
+      environment = fetch_environment(options[:environment], options[:account])
+      environment.launch
+    end
+
   end # CLI
 end # EY

data/lib/engineyard/config.rb

@@ -7,8 +7,8 @@ module EY
     def initialize(file = nil)
       require 'yaml'
       @file = file || CONFIG_FILES.find{|f| File.exists?(f) }
-      @config = @file ? YAML.load_file(@file) : {}
-      @config.merge!("environments" => {}) unless @config["environments"]
+      @config = (@file ? YAML.load_file(@file) : {}) || {} # load_file returns `false' when the file is empty
+      @config["environments"] = {} unless @config["environments"]
     end
 
     def method_missing(meth, *args, &blk)

data/lib/engineyard/model/environment.rb

@@ -1,6 +1,7 @@
 module EY
   module Model
     class Environment < ApiStruct.new(:id, :account, :name, :framework_env, :instances, :instances_count, :apps, :app_master, :username, :app_server_stack_name, :load_balancer_ip_address, :api)
+      require 'launchy'
 
       attr_accessor :ignore_bad_master
 
@@ -132,6 +133,10 @@ module EY
         name.gsub(/^#{Regexp.quote(app.name)}_/, '')
       end
 
+      def launch
+        Launchy.open(app_master!.hostname_url)
+      end
+
       private
 
       def migration_command(deploy_options)

data/lib/engineyard/model/instance.rb

@@ -44,7 +44,6 @@ module EY
         invoke rollback
       end
 
-
       def put_up_maintenance_page(app, verbose=false)
         invoke adapter(app, verbose).enable_maintenance_page
       end
@@ -57,6 +56,10 @@ module EY
         !["db_master", "db_slave"].include?(role.to_s)
       end
 
+      def hostname_url
+        "http://#{hostname}" if hostname
+      end
+
     protected
 
       def engineyard_serverside_hostname

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.22'
+  VERSION = '1.3.25'
 end

data/spec/engineyard/repo_spec.rb

@@ -4,6 +4,7 @@ describe EY::Repo do
   before(:all) do
     FakeFS.deactivate!
     @path = Pathname.new("/tmp/ey-test/.git/")
+    @path.mkpath
     @r = EY::Repo.new("/tmp/ey-test")
   end
   after(:all) { FakeFS.activate! }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 41
   prerelease: 
   segments: 
   - 1
   - 3
-  - 22
-  version: 1.3.22
+  - 25
+  version: 1.3.25
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 -07:00
+date: 2011-09-12 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +30,12 @@ dependencies:
         - 14
         - 6
         version: 0.14.6
-  type: :runtime
-  requirement: *id001
   name: thor
   prerelease: false
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +46,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  type: :runtime
-  requirement: *id002
   name: rest-client
   prerelease: false
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,12 +62,12 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  type: :runtime
-  requirement: *id003
   name: highline
   prerelease: false
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,12 +76,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  requirement: *id004
   name: json_pure
   prerelease: false
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,28 +92,28 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
-  type: :runtime
-  requirement: *id005
   name: escape
   prerelease: false
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 1
         - 4
-        - 2
-        version: 1.4.2
-  type: :runtime
-  requirement: *id006
+        - 1
+        version: 1.4.1
   name: engineyard-serverside-adapter
   prerelease: false
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,12 +124,28 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  type: :runtime
-  requirement: *id007
   name: net-ssh
   prerelease: false
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 0
+        - 5
+        version: 2.0.5
+  name: launchy
+  prerelease: false
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -140,12 +156,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  type: :development
-  requirement: *id008
   name: rspec
   prerelease: false
+  type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,12 +170,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id009
   name: rake
   prerelease: false
+  type: :development
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,12 +184,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id010
   name: fakeweb
   prerelease: false
+  type: :development
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,12 +198,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id011
   name: fakeweb-matcher
   prerelease: false
+  type: :development
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,12 +212,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id012
   name: fakefs
   prerelease: false
+  type: :development
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -210,12 +226,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id013
   name: sinatra
   prerelease: false
+  type: :development
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -226,12 +242,12 @@ dependencies:
         - 1
         - 6
         version: 0.1.6
-  type: :development
-  requirement: *id014
   name: realweb
   prerelease: false
+  type: :development
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -242,10 +258,10 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  type: :development
-  requirement: *id015
   name: open4
   prerelease: false
+  type: :development
+  version_requirements: *id016
 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: 
@@ -282,6 +298,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
@@ -361,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud