engineyard 0.2.9 → 0.2.10

data/lib/engineyard.rb

@@ -1,5 +1,5 @@
 module EY
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 
   autoload :Account, 'engineyard/account'
   autoload :API,     'engineyard/api'
@@ -24,21 +24,5 @@ module EY
       @config ||= EY::Config.new
     end
 
-    def config=(config)
-      @config = config
-    end
-
-    def library(libname)
-      begin
-        require libname
-      rescue LoadError
-        unless @tried_rubygems
-          require 'rubygems' rescue LoadError nil
-          @tried_rubygems = true
-          retry
-        end
-      end
-    end
-
   end
 end

data/lib/engineyard/account.rb

@@ -1,3 +1,8 @@
+require 'engineyard/account/app'
+require 'engineyard/account/app_master'
+require 'engineyard/account/environment'
+require 'engineyard/account/log'
+
 module EY
   class Account
 
@@ -5,10 +10,14 @@ module EY
       @api = api
     end
 
+    def request(path, options = { })
+      @api.request(path, {:method => :get}.merge(options))
+    end
+
     def environments
       return @environments if @environments
-      data = @api.request('/environments', :method => :get)["environments"]
-      @environments = Environment.from_array(data || [])
+      data = request('/environments')["environments"]
+      @environments = Environment.from_array(data || [], self)
     end
 
     def environment_named(name)
@@ -17,8 +26,8 @@ module EY
 
     def apps
       return @apps if @apps
-      data  = @api.request('/apps', :method => :get)["apps"]
-      @apps = App.from_array(data || [])
+      data  = @api.request('/apps')["apps"]
+      @apps = App.from_array(data || [], self)
     end
 
     def app_named(name)
@@ -29,50 +38,5 @@ module EY
       apps.find{|a| repo.urls.include?(a.repository_url) }
     end
 
-    # Classes to represent the returned data
-    class Environment < Struct.new(:name, :instances_count, :apps, :app_master, :username)
-      def self.from_hash(hash)
-        new(
-          hash["name"],
-          hash["instances_count"],
-          App.from_array(hash["apps"]),
-          AppMaster.from_hash(hash["app_master"]),
-          hash["ssh_username"]
-        ) if hash && hash != "null"
-      end
-
-      def self.from_array(array)
-        array.map{|n| from_hash(n) } if array && array != "null"
-      end
-
-      def configuration
-        EY.config.environments[self.name]
-      end
-      alias_method :config, :configuration
-    end
-
-    class App < Struct.new(:name, :repository_url, :environments)
-      def self.from_hash(hash)
-        new(
-          hash["name"],
-          hash["repository_uri"], # We use url canonically in the ey gem
-          Environment.from_array(hash["environments"])
-        ) if hash && hash != "null"
-      end
-
-      def self.from_array(array)
-        array.map{|n| from_hash(n) } if array && array != "null"
-      end
-    end
-
-    class AppMaster < Struct.new(:status, :public_hostname)
-      def self.from_hash(hash)
-        new(
-          hash["status"],
-          hash["public_hostname"]
-        ) if hash && hash != "null"
-      end
-    end
-
   end # Account
 end # EY

data/lib/engineyard/account/app.rb

@@ -0,0 +1,18 @@
+module EY
+  class Account
+    class App < Struct.new(:name, :repository_url, :environments, :account)
+      def self.from_hash(hash, account)
+        new(
+          hash["name"],
+          hash["repository_uri"], # We use url canonically in the ey gem
+          Environment.from_array(hash["environments"], account),
+          account
+        ) if hash && hash != "null"
+      end
+
+      def self.from_array(array, account)
+        array.map{|n| from_hash(n, account) } if array && array != "null"
+      end
+    end
+  end
+end

data/lib/engineyard/account/app_master.rb

@@ -0,0 +1,12 @@
+module EY
+  class Account
+    class AppMaster < Struct.new(:status, :public_hostname)
+      def self.from_hash(hash)
+        new(
+          hash["status"],
+          hash["public_hostname"]
+        ) if hash && hash != "null"
+      end
+    end
+  end
+end

data/lib/engineyard/account/environment.rb

@@ -0,0 +1,31 @@
+module EY
+  class Account
+    class Environment < Struct.new(:id, :name, :instances_count, :apps, :app_master, :username, :account)
+      def self.from_hash(hash, account)
+        new(
+          hash["id"],
+          hash["name"],
+          hash["instances_count"],
+          App.from_array(hash["apps"], account),
+          AppMaster.from_hash(hash["app_master"]),
+          hash["ssh_username"],
+          account
+        ) if hash && hash != "null"
+      end
+
+      def self.from_array(array, account)
+        array.map{|n| from_hash(n, account) } if array && array != "null"
+      end
+
+      def logs
+        data = account.request("/environments/#{id}/logs")['logs']
+        Log.from_array(data || [])
+      end
+
+      def configuration
+        EY.config.environments[self.name]
+      end
+      alias_method :config, :configuration
+    end
+  end
+end

data/lib/engineyard/account/log.rb

@@ -0,0 +1,18 @@
+class Log < Struct.new(:id, :role, :main, :custom)
+  def self.from_hash(hash)
+    new(
+      hash["id"],
+      hash["role"],
+      hash["main"],
+      hash["custom"]
+    ) if hash && hash != "null"
+  end
+
+  def self.from_array(array)
+    array.map{|n| from_hash(n) } if array && array != "null"
+  end
+
+  def instance_name
+    "#{role} #{id}"
+  end
+end

data/lib/engineyard/api.rb

@@ -24,8 +24,8 @@ module EY
     class RequestFailed < EY::Error; end
 
     def self.request(path, opts={})
-      EY.library 'rest_client'
-      EY.library 'json'
+      require 'rest_client'
+      require 'json'
 
       url = EY.config.endpoint + "api/v2#{path}"
       method = ((meth = opts.delete(:method)) && meth.to_s || "get").downcase.to_sym
@@ -50,6 +50,8 @@ module EY
         raise RequestFailed, "The requested resource could not be found"
       rescue RestClient::RequestFailed => e
         raise RequestFailed, "#{e.message}"
+      rescue OpenSSL::SSL::SSLError
+        raise RequestFailed, "SSL is misconfigured on your cloud"
       end
       raise RequestFailed, "Response body was empty" if resp.body.empty?
 

data/lib/engineyard/cli.rb

@@ -1,12 +1,10 @@
-$:.unshift File.expand_path('../../vendor', __FILE__)
 require 'thor'
-
 require 'engineyard'
 require 'engineyard/cli/error'
 
 module EY
   class CLI < Thor
-    EYSD_VERSION = "~>0.2.4"
+    EYSD_VERSION = "~>0.2.5"
 
     autoload :API, 'engineyard/cli/api'
     autoload :UI,  'engineyard/cli/ui'
@@ -22,6 +20,7 @@ module EY
     method_option :force, :type => :boolean, :aliases => %w(-f),
       :desc => "Force a deploy of the specified branch"
     method_option :migrate, :type => :string, :aliases => %w(-m),
+      :default => 'rake db:migrate',
       :desc => "Run migrations via [MIGRATE], defaults to 'rake db:migrate'"
     method_option :install_eysd, :type => :boolean, :aliases => %(-s),
       :desc => "Force remote install of eysd"
@@ -39,7 +38,7 @@ module EY
       invalid_branch = default_branch && (branch != default_branch) && !options[:force]
       raise BranchMismatch.new(default_branch, branch) if invalid_branch
 
-      if env_name
+      if env_name && app.environments
         env = app.environments.find{|e| e.name == env_name }
       else
         env = app.environments.first
@@ -84,12 +83,8 @@ module EY
         deploy_cmd << " --config '#{escaped_config_option}'"
       end
 
-      if options.key(:migrate)
-        if options[:migrate]
-          deploy_cmd << " --migrate='#{options[:migrate]}'"
-        else
-          deploy_cmd << " --no-migrate"
-        end
+      if options['migrate']
+        deploy_cmd << " --migrate='#{options[:migrate]}'"
       end
 
       EY.ui.info "Running deploy on server..."
@@ -129,6 +124,30 @@ module EY
       end
     end
 
+    desc "logs environment", "Retrieve the latest logs for an enviornment"
+    def logs(environment)
+      env = account.environment_named(environment)
+
+      if env.nil?
+        raise EnvironmentError, "Environment '#{env_name}' can't be found\n" +
+          "You can create it at #{EY.config.endpoint}"
+      else
+        env.logs.each do |log|
+          EY.ui.info log.instance_name
+
+          if log.main
+            EY.ui.info "Main logs:"
+            EY.ui.say  log.main
+          end
+
+          if log.custom
+            EY.ui.info "Custom logs:"
+            EY.ui.say  log.custom
+          end
+        end # logs_for_environment(env).each
+      end # env.nil?
+    end
+
     desc "version", "Print the version of the engineyard gem"
     def version
       EY.ui.say %{engineyard version #{EY::VERSION}}
@@ -167,7 +186,11 @@ module EY
       cmd << %{ &> /dev/null} unless output
       EY.ui.debug(cmd)
       puts cmd if output
-      system cmd unless ENV["NO_SSH"]
+      unless ENV["NO_SSH"]
+        system cmd
+      else
+        true
+      end
     end
 
   end # CLI

data/lib/engineyard/cli/ui.rb

@@ -45,7 +45,7 @@ module EY
 
       def ask(message, password = false)
         begin
-          EY.library 'highline'
+          require 'highline'
           @hl ||= HighLine.new($stdin)
           if not $stdin.tty?
             @hl.ask(message)

data/spec/engineyard/api_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe EY::API do
   it "gets the api token from ~/.eyrc if possible" do
-    write_config({"api_token" => "asdf"}, '~/.eyrc')
+    write_yaml({"api_token" => "asdf"}, '~/.eyrc')
     EY::API.new.should == EY::API.new("asdf")
   end
 
@@ -17,7 +17,7 @@ describe EY::API do
     end
 
     it "puts the api token into .eyrc" do
-      load_config('~/.eyrc')["api_token"].should == "asdf"
+      read_yaml('~/.eyrc')["api_token"].should == "asdf"
     end
   end
 
@@ -25,18 +25,18 @@ describe EY::API do
     context "without a custom endpoint" do
       it "saves the api token at the root of the data" do
         EY::API.save_token("asdf")
-        load_config('~/.eyrc')["api_token"].should == "asdf"
+        read_yaml('~/.eyrc')["api_token"].should == "asdf"
       end
     end
 
     context "with a custom endpoint" do
-      before do
-        write_config({"endpoint" => "http://localhost/"}, 'ey.yml')
+      before(:each) do
+        write_yaml({"endpoint" => "http://localhost/"}, 'ey.yml')
         EY::API.save_token("asdf")
       end
 
       it "saves the api token" do
-        load_config('~/.eyrc').should == {"http://localhost/" => {"api_token" => "asdf"}}
+        read_yaml('~/.eyrc').should == {"http://localhost/" => {"api_token" => "asdf"}}
       end
 
       it "reads the api token" do

data/spec/engineyard/cli/api_spec.rb

@@ -22,7 +22,7 @@ describe EY::CLI::API do
     before(:each) do
       FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/authenticate", :body => %|{"api_token": "asdf"}|)
 
-      capture_stdout("\n\n") do
+      capture_stdio("\n\n") do
         @token = EY::CLI::API.new
       end
     end

data/spec/engineyard/config_spec.rb

@@ -4,12 +4,12 @@ require 'uri'
 describe EY::Config do
   describe "environments" do
     it "get loaded from the config file" do
-      write_config("environments" => {"production" => {"default" => true}})
+      write_yaml("environments" => {"production" => {"default" => true}})
       EY::Config.new.environments["production"]["default"].should be_true
     end
 
     it "are present when the config file has no environments key" do
-      write_config("endpoint" => "http://localhost/")
+      write_yaml("endpoint" => "http://localhost/")
       EY::Config.new.environments.should == {}
     end
   end
@@ -20,36 +20,36 @@ describe EY::Config do
     end
 
     it "gets loaded from the config file" do
-      write_config("endpoint" => "http://localhost/")
+      write_yaml("endpoint" => "http://localhost/")
       EY::Config.new.endpoint.should == URI.parse("http://localhost/")
     end
 
     it "raises on an invalid endpoint" do
-      write_config("endpoint" => "non/absolute")
+      write_yaml("endpoint" => "non/absolute")
       lambda { EY::Config.new.endpoint }.
         should raise_error(EY::Config::ConfigurationError)
     end
   end
 
   it "provides default_endpoint?" do
-    write_config("endpoint" => "http://localhost/")
+    write_yaml("endpoint" => "http://localhost/")
     EY::Config.new.default_endpoint?.should_not be_true
   end
 
   describe "files" do
     it "looks for config/ey.yml" do
-      write_config({"endpoint" => "http://something/"}, "ey.yml")
-      write_config({"endpoint" => "http://localhost/"}, "config/ey.yml")
+      write_yaml({"endpoint" => "http://something/"}, "ey.yml")
+      write_yaml({"endpoint" => "http://localhost/"}, "config/ey.yml")
       EY::Config.new.endpoint.should == URI.parse("http://localhost/")
     end
 
     it "looks for ey.yml" do
-      write_config({"endpoint" => "http://foo/"}, "ey.yml")
+      write_yaml({"endpoint" => "http://foo/"}, "ey.yml")
       EY::Config.new.endpoint.should == URI.parse("http://foo/")
     end
 
     it "looks for the file given" do
-      write_config({"endpoint" => "http://bar/"}, "summat.yml")
+      write_yaml({"endpoint" => "http://bar/"}, "summat.yml")
       EY::Config.new("summat.yml").endpoint.should == URI.parse("http://bar/")
     end
   end

data/spec/ey/deploy_spec.rb

@@ -2,14 +2,16 @@ require 'spec_helper'
 
 describe "ey deploy" do
   before(:all) do
-    ENV['EYRC'] = "/tmp/eyrc"
-    ENV['CLOUD_URL'] = "http://localhost:4000"
     FakeFS.deactivate!
+    ENV['EYRC'] = "/tmp/eyrc"
+    ENV['CLOUD_URL'] = EY.fake_awsm
+    FakeWeb.allow_net_connect = true
   end
 
   after(:all) do
     ENV['CLOUD_URL'] = nil
     FakeFS.activate!
+    FakeWeb.allow_net_connect = false
   end
 
   describe "without an eyrc file" do
@@ -18,10 +20,11 @@ describe "ey deploy" do
     end
 
     it "prompts for authentication" do
-      ey("deploy") do |input|
-        input.puts("aarko@engineyard.com")
-        input.puts("reversal")
+      ey("deploy", :hide_err => true) do |input|
+        input.puts("test@test.test")
+        input.puts("test")
       end
+
       @out.should include("We need to fetch your API token, please login")
       @out.should include("Email:")
       @out.should include("Password:")
@@ -36,30 +39,46 @@ describe "ey deploy" do
     end
 
     it "complains when there is no app" do
-      return pending "this should not hit a live app"
+      api_scenario "empty"
       ey "deploy", :hide_err => true
-      @err.should include %|no application configured|
+      @err.should include(%|no application configured|)
     end
 
-    it "complains when there is no environment" do
-      return pending
-      api_scenario :no_environments
-      ey "deploy"
-      @out.should match(/no environment/i)
+    it "complains when there is no environment for the app" do
+      api_scenario "one app, one environment, not linked"
+      ey "deploy giblets master", :hide_err => true
+      @err.should match(/doesn't run this application/i)
     end
 
     it "runs when environment is known" do
-      return pending
-      api_scenario :one_environment
-      ey "deploy"
-      @out.should match(/deploying/i)
+      api_scenario "one app, one environment"
+      ey "deploy", :hide_err => true
+      @out.should match(/running deploy/i)
+      @err.should be_empty
     end
 
     it "complains when environment is ambiguous" do
-      return pending
-      api_scenario :two_environments
-      ey "deploy"
-      @out.should match(/was called incorrectly/i)
+      api_scenario "one app, two environments"
+      ey "deploy", :hide_err => true
+      @err.should match(/was called incorrectly/i)
+    end
+
+    context "migration command" do
+      before(:each) do
+        api_scenario "one app, one environment"
+      end
+
+      it "defaults to 'rake db:migrate'" do
+        ey "deploy"
+        @ssh_commands.size.should == 1
+        @ssh_commands.first.should =~ /--migrate='rake db:migrate'/
+      end
+
+      it "can be disabled with --no-migrate" do
+        ey "deploy --no-migrate"
+        @ssh_commands.size.should == 1
+        @ssh_commands.first.should_not =~ /--migrate/
+      end
     end
   end
-end
+end