engineyard-cloud-client 0.1.4 → 1.0.0

data/lib/engineyard-cloud-client.rb

@@ -3,7 +3,6 @@ module EY
   end
 end
 
-require 'engineyard-cloud-client/ruby_ext'
 require 'engineyard-cloud-client/model_registry'
 require 'engineyard-cloud-client/models'
 require 'engineyard-cloud-client/rest_client_ext'

data/lib/engineyard-cloud-client/models/app_environment.rb

@@ -1,4 +1,3 @@
-require 'launchy'
 require 'engineyard-cloud-client/models'
 require 'engineyard-cloud-client/errors'
 
@@ -64,7 +63,7 @@ module EY
         app.repository_uri
       end
 
-      def to_hierarchy_str
+      def hierarchy_name
         [account_name, app_name, environment_name].join('/')
       end
 
@@ -76,10 +75,6 @@ module EY
         Deployment.from_hash(api, attrs.merge(:app_environment => self))
       end
 
-      def short_environment_name
-        environment.name.gsub(/^#{Regexp.quote(app.name)}_/, '')
-      end
-
     end
   end
 end

data/lib/engineyard-cloud-client/models/deployment.rb

@@ -47,6 +47,7 @@ module EY
       alias deployed_by= user_name=
 
       def config
+        return {} unless deployed_by # not started yet so not all info is here
         @config ||= {'deployed_by' => deployed_by}.merge(extra_config)
       end
 

data/lib/engineyard-cloud-client/models/environment.rb

@@ -1,5 +1,6 @@
 require 'engineyard-cloud-client/models'
 require 'engineyard-cloud-client/errors'
+require 'tempfile'
 
 module EY
   class CloudClient
@@ -137,30 +138,24 @@ module EY
         bridge
       end
 
-      def rebuild
+      def update
         api.request("/environments/#{id}/update_instances", :method => :put)
+        true # raises on failure
       end
+      alias rebuild update
 
       def run_custom_recipes
         api.request("/environments/#{id}/run_custom_recipes", :method => :put)
+        true
       end
 
       def download_recipes
-        if File.exist?('cookbooks')
-          raise EY::CloudClient::Error, "Could not download, cookbooks already exists"
-        end
-
-        require 'tempfile'
         tmp = Tempfile.new("recipes")
-        tmp.write(api.request("/environments/#{id}/recipes"))
+        data = api.request("/environments/#{id}/recipes")
+        tmp.write(data)
         tmp.flush
         tmp.close
-
-        cmd = "tar xzf '#{tmp.path}' cookbooks"
-
-        unless system(cmd)
-          raise EY::CloudClient::Error, "Could not unarchive recipes.\nCommand `#{cmd}` exited with an error."
-        end
+        tmp
       end
 
       def upload_recipes_at_path(recipes_path)
@@ -172,27 +167,14 @@ module EY
         end
       end
 
-      def tar_and_upload_recipes_in_cookbooks_dir
-        require 'tempfile'
-        unless File.exist?("cookbooks")
-          raise EY::CloudClient::Error, "Could not find chef recipes. Please run from the root of your recipes repo."
-        end
-
-        recipes_file = Tempfile.new("recipes")
-        cmd = "tar czf '#{recipes_file.path}' cookbooks/"
-
-        unless system(cmd)
-          raise EY::CloudClient::Error, "Could not archive recipes.\nCommand `#{cmd}` exited with an error."
-        end
-
-        upload_recipes(recipes_file)
-      end
-
+      # Expects a File object opened for binary reading.
+      # i.e. File.open(path, 'rb')
       def upload_recipes(file_to_upload)
         api.request("/environments/#{id}/recipes", {
           :method => :post,
           :params => {:file => file_to_upload}
         })
+        true
       end
 
       def shorten_name_for(app)
@@ -202,18 +184,18 @@ module EY
       private
 
       def request_instances
-        instances_attrs = api.request("/environments/#{id}/instances")["instances"]
-        load_instances(instances_attrs)
+        if instances_count > 0
+          instances_attrs = api.request("/environments/#{id}/instances")["instances"]
+          load_instances(instances_attrs)
+        else
+          []
+        end
       end
 
       def load_instances(instances_attrs)
         Instance.from_array(api, instances_attrs, 'environment' => self)
       end
 
-      def no_migrate?(deploy_options)
-        deploy_options.key?('migrate') && deploy_options['migrate'] == false
-      end
-
       # attrs["cluster_configuration"]["cluster"] can be 'single', 'cluster', or 'custom'
       # attrs["cluster_configuration"]["ip"] can be
       #   * 'host' (amazon public hostname)

data/lib/engineyard-cloud-client/test/fake_awsm/config.ru

@@ -34,6 +34,13 @@ class FakeAwsm < Sinatra::Base
   end
 
   before do
+    if env['PATH_INFO'] =~ %r#/api/v2#
+      user_agent = env['HTTP_USER_AGENT']
+      unless user_agent =~ %r#^EngineYardCloudClient/\d#
+        $stderr.puts 'No user agent header, expected EngineYardCloudClient/'
+        halt 400, 'No user agent header, expected EngineYardCloudClient/'
+      end
+    end
     content_type "application/json"
     token = request.env['HTTP_X_EY_CLOUD_TOKEN']
     if token
@@ -85,7 +92,6 @@ class FakeAwsm < Sinatra::Base
   end
 
   get "/api/v2/apps" do
-    raise('No user agent header') unless env['HTTP_USER_AGENT'] =~ %r#^EngineYardCloudClient/#
     @apps = @user.accounts.apps
     render :rabl, :apps, :format => "json"
   end
@@ -115,7 +121,7 @@ class FakeAwsm < Sinatra::Base
     {
       "logs" => [
         {
-          "id" => params['env_id'].to_i,
+          "id" => 'i-12345678',
           "role" => "app_master",
           "main" => "MAIN LOG OUTPUT",
           "custom" => "CUSTOM LOG OUTPUT"
@@ -168,28 +174,23 @@ class FakeAwsm < Sinatra::Base
     ""
   end
 
-  get "/api/v2/apps/:app_id/environments/:environment_id/deployments/last" do
-    {
-      "deployment" => {
-        "id" => 3,
-        "ref" => "HEAD",
-        "resolved_ref" => "HEAD",
-        "commit" => 'a'*40,
-        "user_name" => "User Name",
-        "migrate_command" => "rake db:migrate --trace",
-        "created_at" => Time.now.utc - 3600,
-        "finished_at" => Time.now.utc - 3400,
-        "successful" => true,
-      }
-    }.to_json
+  post "/api/v2/apps/:app_id/environments/:environment_id/deployments" do
+    app_env = @user.accounts.apps.get(params[:app_id]).app_environments.first(:environment_id => params[:environment_id])
+    @deployment = app_env.deployments.create(params[:deployment])
+    render :rabl, :deployment, :format => "json"
   end
 
-  post "/api/v2/apps/:app_id/environments/:environment_id/deployments" do
-    {"deployment" => params[:deployment].merge({"id" => 2, "commit" => 'a'*40, "resolved_ref" => "resolved-#{params[:deployment][:ref]}"})}.to_json
+  get "/api/v2/apps/:app_id/environments/:environment_id/deployments/last" do
+    app_env = @user.accounts.apps.get(params[:app_id]).app_environments.first(:environment_id => params[:environment_id])
+    @deployment = app_env.deployments.last
+    render :rabl, :deployment, :format => "json"
   end
 
   put "/api/v2/apps/:app_id/environments/:environment_id/deployments/:deployment_id/finished" do
-    {"deployment" => params[:deployment].merge({"id" => 2, "finished_at" => Time.now})}.to_json
+    app_env = @user.accounts.apps.get(params[:app_id]).app_environments.first(:environment_id => params[:environment_id])
+    @deployment = app_env.deployments.get(params[:deployment_id])
+    @deployment.finished!(params[:deployment])
+    render :rabl, :deployment, :format => "json"
   end
 
   post "/api/v2/authenticate" do

data/lib/engineyard-cloud-client/test/fake_awsm/models/deployment.rb

@@ -0,0 +1,42 @@
+require 'dm-core'
+
+class Deployment
+  include DataMapper::Resource
+
+  property :id,                 Serial
+  property :created_at,         DateTime
+  property :finished_at,        DateTime
+  property :commit,             String, :default => 'abcdef1234'*4
+  property :migrate,            String
+  property :migrate_command,    String
+  property :ref,                String
+  property :successful,         Boolean
+  property :output,             Text
+
+  belongs_to :app_environment
+
+  def inspect
+    "#<Deployment app_environment:#{app_environment.inspect}>"
+  end
+
+  def user_name
+    app_environment.app.account.user.name
+  end
+
+  # normally a property, but we don't have the code to find this so just pretend
+  def resolved_ref
+    "resolved-#{ref}"
+  end
+
+  def finished?
+    finished_at != nil
+  end
+
+  def finished!(attrs)
+    return true if finished?
+    attrs = attrs.dup
+    attrs['finished_at'] ||= Time.now
+    update(attrs)
+  end
+
+end

data/lib/engineyard-cloud-client/test/fake_awsm/views/base_app.rabl

@@ -0,0 +1,4 @@
+attributes :id, :name, :repository_uri, :app_type_id
+child :account do
+  attributes :id, :name
+end

data/lib/engineyard-cloud-client/test/fake_awsm/views/deployment.rabl

@@ -0,0 +1,2 @@
+object @deployment
+attributes :id, :ref, :resolved_ref, :commit, :user_name, :migrate_command, :created_at, :finished_at, :successful

data/lib/engineyard-cloud-client/test/fake_awsm/views/environments.rabl

@@ -3,9 +3,8 @@ attributes :id, :ssh_username, :name, :instances_count, :app_server_stack_name,
 child :account do
   attributes :id, :name
 end
-child :apps do
-  attributes :id, :name, :repository_uri, :app_type_id
-  child :account do
-    attributes :id, :name
+node :apps do |m|
+  m.apps.map do |app|
+    partial('base_app', :object => app, :root => nil)
   end
 end

data/lib/engineyard-cloud-client/version.rb

@@ -1,7 +1,7 @@
 # This file is maintained by a herd of rabid monkeys with Rakes.
 module EY
   class CloudClient
-    VERSION = '0.1.4'
+    VERSION = '1.0.0'
   end
 end
 # Please be aware that the monkeys like tho throw poo sometimes.

data/spec/engineyard-cloud-client/integration/app_environment_spec.rb

@@ -9,7 +9,7 @@ describe EY::CloudClient::AppEnvironment do
   describe ".resolve" do
     it "finds an environment" do
       api = scenario_cloud_client "Multiple Ambiguous Accounts"
-      result = EY::CloudClient::AppEnvironment.resolve(api, 'app_name' => 'rails232app', 'environment_name' => 'giblets', 'account_name' => 'main')
+      result = api.resolve_app_environments('app_name' => 'rails232app', 'environment_name' => 'giblets', 'account_name' => 'main')
       result.should be_one_match
     end
 
@@ -35,4 +35,20 @@ describe EY::CloudClient::AppEnvironment do
     end
   end
 
+  describe "model" do
+    before do
+      api = scenario_cloud_client "Multiple Ambiguous Accounts"
+      result = EY::CloudClient::AppEnvironment.resolve(api, 'app_name' => 'rails232app', 'environment_name' => 'giblets', 'account_name' => 'main')
+      result.should be_one_match
+      @app_env = result.matches.first
+    end
+
+    it "supplies methods to easily access names and attributes" do
+      @app_env.account_name.should == 'main'
+      @app_env.app_name.should == 'rails232app'
+      @app_env.environment_name.should == 'giblets'
+      @app_env.hierarchy_name.should == 'main/rails232app/giblets'
+      @app_env.repository_uri.should == 'user@git.host:path/to/repo.git'
+    end
+  end
 end

data/spec/engineyard-cloud-client/integration/app_spec.rb

@@ -12,6 +12,12 @@ describe EY::CloudClient::App do
       apps = EY::CloudClient::App.all(api)
       apps.size.should == 1
       app = apps.first
+      app.name.should == 'rails232app'
+    end
+
+    it "includes environments in all apps" do
+      api = scenario_cloud_client "One App Many Envs"
+      app = api.apps.first
       app.environments.size.should == 2
       app.environments.map(&:name).should =~ %w[giblets bakon]
     end

data/spec/engineyard-cloud-client/integration/deployment_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe EY::CloudClient::AppEnvironment do
+  before(:each) do
+    FakeWeb.allow_net_connect = true
+    EY::CloudClient.endpoint = EY::CloudClient::Test::FakeAwsm.uri
+  end
+
+  describe "deploying" do
+    before do
+      @api = scenario_cloud_client "Multiple Ambiguous Accounts"
+      result = EY::CloudClient::AppEnvironment.resolve(@api, 'app_name' => 'rails232app', 'environment_name' => 'giblets', 'account_name' => 'main')
+      result.should be_one_match
+      @app_env = result.matches.first
+    end
+
+    it "creates a deployment" do
+      deployment = @app_env.new_deployment({
+        :ref             => 'master',
+        :migrate         => true,
+        :migrate_command => 'rake migrate',
+        :extra_config    => {'extra' => 'config'},
+      })
+      deployment.commit.should be_nil
+      deployment.resolved_ref.should be_nil
+
+      deployment.start
+
+      deployment.config.should == {'deployed_by' => 'Multiple Ambiguous Accounts', 'extra' => 'config'}
+      deployment.commit.should_not be_nil
+      deployment.resolved_ref.should_not be_nil
+      deployment.out << "Test output"
+      deployment.out << "Test error"
+      deployment.successful = true
+      deployment.finished
+      deployment.should be_finished
+
+      found_dep = @app_env.last_deployment
+      found_dep.id.should == deployment.id
+      found_dep.should be_finished
+    end
+
+    it "returns nil when a not found deployment is requested" do
+      EY::CloudClient::Deployment.get(@api, @app_env, 0).should be_nil
+    end
+  end
+end

data/spec/engineyard-cloud-client/integration/environment_spec.rb

@@ -12,13 +12,26 @@ describe EY::CloudClient::Environment do
       envs = EY::CloudClient::Environment.all(api)
       envs.size.should == 3
       envs.map(&:name).should =~ %w[giblets bakon beef]
+      envs.map(&:username).should =~ %w[turkey ham hamburger]
+      envs.map(&:account_name).uniq.should == ['main']
+      with_instances = envs.select {|env| env.instances_count > 0 }
+      with_instances.size.should == 1
+      with_instances.first.instances.map(&:amazon_id).should == ['i-ddbbdd92']
+    end
+
+    it "includes apps in environments" do
+      api = scenario_cloud_client "One App Many Envs"
+      envs = api.environments
+      envs.map do |env|
+        env.apps.first && env.apps.first.name
+      end.should == ['rails232app', 'rails232app', nil] # 2 envs with the same app, 1 without
     end
   end
 
   describe ".resolve" do
     it "finds an environment" do
       api = scenario_cloud_client "Multiple Ambiguous Accounts"
-      result = EY::CloudClient::Environment.resolve(api, 'environment_name' => 'giblets', 'account_name' => 'main' )
+      result = api.resolve_environments('environment_name' => 'giblets', 'account_name' => 'main' )
       result.should be_one_match
     end
 
@@ -44,13 +57,65 @@ describe EY::CloudClient::Environment do
     end
   end
 
-  describe "loading instances" do
-    it "requests instances" do
+  context "with an environment" do
+    before do
       api = scenario_cloud_client "Linked App"
       result = EY::CloudClient::Environment.resolve(api, 'account_name' => 'main', 'app_name' => 'rails232app', 'environment_name' => 'giblets')
-      env = result.matches.first
-      env.bridge.role.should == 'app_master'
-      env.instances.size.should == env.instances_count
+      @env = result.matches.first
+    end
+
+    it "requests instances when needed" do
+      @env.bridge.role.should == 'app_master'
+      @env.instances.size.should == @env.instances_count
+    end
+
+    it "doesn't request when instances_count is zero" do
+      api = scenario_cloud_client "Linked App Not Running"
+      result = EY::CloudClient::Environment.resolve(api, 'account_name' => 'main', 'app_name' => 'rails232app', 'environment_name' => 'giblets')
+      @env = result.matches.first
+      @env.instances_count.should == 0
+      @env.instances.should == []
+    end
+
+    it "selects deploy_to_instances" do
+      @env.deploy_to_instances.map(&:role).should =~ %w[app_master app util util]
+    end
+
+    it "updates the environment" do
+      @env.update.should be_true
+    end
+
+    it "runs custom recipes" do
+      @env.run_custom_recipes.should be_true
+    end
+
+    it "uploads recipes" do
+      res = @env.upload_recipes(Pathname.new('spec/support/fixture_recipes.tgz').expand_path.open('rb'))
+      res.should be_true
+    end
+
+    it "uploads recipes at path" do
+      res = @env.upload_recipes_at_path(Pathname.new('spec/support/fixture_recipes.tgz').expand_path.to_s)
+      res.should be_true
+    end
+
+    it "raises if uploads recipes path doesn't exist" do
+      path = Pathname.new('spec/support/nothing')
+      lambda {
+        @env.upload_recipes_at_path(path)
+      }.should raise_error(EY::CloudClient::Error, "Recipes file not found: #{path}")
+    end
+
+    it "downloads recipes" do
+      @env.download_recipes
+    end
+
+    it "returns logs" do
+      log = @env.logs.first
+      log.main.should == 'MAIN LOG OUTPUT'
+      log.custom.should == 'CUSTOM LOG OUTPUT'
+      log.role.should == 'app_master'
+      log.instance_name.should == "app_master i-12345678"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-cloud-client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -288,12 +272,11 @@ files:
 - lib/engineyard-cloud-client/models.rb
 - lib/engineyard-cloud-client/resolver_result.rb
 - lib/engineyard-cloud-client/rest_client_ext.rb
-- lib/engineyard-cloud-client/ruby_ext.rb
 - lib/engineyard-cloud-client/test/fake_awsm/config.ru
 - lib/engineyard-cloud-client/test/fake_awsm/models/account.rb
 - lib/engineyard-cloud-client/test/fake_awsm/models/app.rb
 - lib/engineyard-cloud-client/test/fake_awsm/models/app_environment.rb
-- lib/engineyard-cloud-client/test/fake_awsm/models/deployments.rb
+- lib/engineyard-cloud-client/test/fake_awsm/models/deployment.rb
 - lib/engineyard-cloud-client/test/fake_awsm/models/environment.rb
 - lib/engineyard-cloud-client/test/fake_awsm/models/instance.rb
 - lib/engineyard-cloud-client/test/fake_awsm/models/user.rb
@@ -301,8 +284,10 @@ files:
 - lib/engineyard-cloud-client/test/fake_awsm/scenarios.rb
 - lib/engineyard-cloud-client/test/fake_awsm/views/accounts.rabl
 - lib/engineyard-cloud-client/test/fake_awsm/views/apps.rabl
+- lib/engineyard-cloud-client/test/fake_awsm/views/base_app.rabl
 - lib/engineyard-cloud-client/test/fake_awsm/views/base_app_environment.rabl
 - lib/engineyard-cloud-client/test/fake_awsm/views/base_environment.rabl
+- lib/engineyard-cloud-client/test/fake_awsm/views/deployment.rabl
 - lib/engineyard-cloud-client/test/fake_awsm/views/environments.rabl
 - lib/engineyard-cloud-client/test/fake_awsm/views/instances.rabl
 - lib/engineyard-cloud-client/test/fake_awsm/views/resolve_app_environments.rabl
@@ -320,6 +305,7 @@ files:
 - spec/engineyard-cloud-client/integration/account_spec.rb
 - spec/engineyard-cloud-client/integration/app_environment_spec.rb
 - spec/engineyard-cloud-client/integration/app_spec.rb
+- spec/engineyard-cloud-client/integration/deployment_spec.rb
 - spec/engineyard-cloud-client/integration/environment_spec.rb
 - spec/engineyard-cloud-client/integration/user_spec.rb
 - spec/engineyard-cloud-client/models/api_struct_spec.rb
@@ -328,6 +314,7 @@ files:
 - spec/engineyard-cloud-client/models/instance_spec.rb
 - spec/engineyard-cloud-client/models/keypair_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixture_recipes.tgz
 - spec/support/helpers.rb
 - spec/support/matchers.rb
 homepage: http://github.com/engineyard/engineyard-cloud-client
@@ -344,7 +331,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2106101747118900682
+      hash: 3506935384923941414
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -353,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2106101747118900682
+      hash: 3506935384923941414
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -365,6 +352,7 @@ test_files:
 - spec/engineyard-cloud-client/integration/account_spec.rb
 - spec/engineyard-cloud-client/integration/app_environment_spec.rb
 - spec/engineyard-cloud-client/integration/app_spec.rb
+- spec/engineyard-cloud-client/integration/deployment_spec.rb
 - spec/engineyard-cloud-client/integration/environment_spec.rb
 - spec/engineyard-cloud-client/integration/user_spec.rb
 - spec/engineyard-cloud-client/models/api_struct_spec.rb
@@ -373,5 +361,6 @@ test_files:
 - spec/engineyard-cloud-client/models/instance_spec.rb
 - spec/engineyard-cloud-client/models/keypair_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixture_recipes.tgz
 - spec/support/helpers.rb
 - spec/support/matchers.rb

data/lib/engineyard-cloud-client/ruby_ext.rb

@@ -1,9 +0,0 @@
-class Object
-  unless respond_to?(:tap)
-    # Ruby 1.9 has it, 1.8 doesn't
-    def tap
-      yield self
-      self
-    end
-  end
-end

data/lib/engineyard-cloud-client/test/fake_awsm/models/deployments.rb

@@ -1,15 +0,0 @@
-require 'dm-core'
-
-class Deployment
-  include DataMapper::Resource
-
-  property :id, Serial
-  property :app_environment_id, Integer
-
-  belongs_to :app_environment
-
-  def inspect
-    "#<Deployment app_environment:#{app_environment.inspect}>"
-  end
-
-end