engineyard 0.8.2 → 0.9.0

data/lib/engineyard/api.rb

@@ -38,19 +38,9 @@ module EY
       app_for_repo(repo) || raise(NoAppError.new(repo))
     end
 
-    def fetch_app(name)
-      apps.find{|a| a.name == name}
-    end
-
-    def fetch_app!(name)
-      return unless name
-      fetch_app(name) || raise(InvalidAppError.new(name))
-    end
-
     class InvalidCredentials < EY::Error; end
     class RequestFailed < EY::Error; end
 
-
     def self.request(path, opts={})
       require 'rest_client'
       require 'json'

data/lib/engineyard/collection.rb

@@ -1,5 +1,7 @@
 module EY
   module Collection
+    autoload :Abstract,     'engineyard/collection/abstract'
     autoload :Environments, 'engineyard/collection/environments'
+    autoload :Apps,         'engineyard/collection/apps'
   end
 end

data/lib/engineyard/collection/abstract.rb

@@ -0,0 +1,43 @@
+require 'engineyard/error'
+
+module EY
+  module Collection
+    class Abstract < Array
+
+      def named(name)
+        find {|x| x.name == name }
+      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 = find_all{|e| e.name[name_part] }
+        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

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

data/lib/engineyard/collection/environments.rb

@@ -1,35 +1,8 @@
-require 'engineyard/error'
-
 module EY
   module Collection
-    class Environments < Array
-
-      def named(name)
-        find {|e| e.name == name}
-      end
-
-      def named!(name)
-        named(name) or raise EnvironmentError,
-        "Environment '#{name}' can't be found\nYou can create it at #{EY.config.endpoint}"
-      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 NoEnvironmentError.new(name_part)
-      end
-
-    private
-      def find_by_unambiguous_substring(name_part)
-        candidates = find_all{|e| e.name[name_part] }
-        if candidates.size > 1
-          raise AmbiguousEnvironmentName.new(name_part, candidates.map {|e| e.name})
-        end
-        candidates.first
-      end
-
+    class Environments < Abstract
+      self.invalid_error = NoEnvironmentError
+      self.ambiguous_error = AmbiguousEnvironmentName
     end
   end
 end

data/lib/engineyard/error.rb

@@ -1,5 +1,11 @@
 module EY
-  class Error < RuntimeError; end
+  class Error < RuntimeError
+    def ambiguous(type, name, matches)
+      pretty_names = matches.map {|x| "'#{x}'"}.join(', ')
+      "The name '#{name}' is ambiguous; it matches all of the following #{type} names: #{pretty_names}.\n" +
+      "Please use a longer, unambiguous substring or the entire #{type} name."
+    end
+  end
 
   class NoRemotesError < EY::Error
     def initialize(path)
@@ -23,6 +29,12 @@ module EY
     end
   end
 
+  class AmbiguousAppName < EY::Error
+    def initialize(name, matches)
+      super ambiguous("app", name, matches)
+    end
+  end
+
   class NoAppMaster < EY::Error
     def initialize(env_name)
       super "The environment '#{env_name}' does not have a master instance."
@@ -40,9 +52,7 @@ module EY
 
   class AmbiguousEnvironmentName < EY::EnvironmentError
     def initialize(name, matches)
-      pretty_names = matches.map {|x| "'#{x}'"}.join(', ')
-      super "The name '#{name}' is ambiguous; it matches all of the following environment names: #{pretty_names}.\n" +
-      "Please use a longer, unambiguous substring or the entire environment name."
+      super ambiguous("environment", name, matches)
     end
   end
 

data/lib/engineyard/model/app.rb

@@ -8,6 +8,10 @@ module EY
         end
       end
 
+      def self.from_array(*)
+        Collection::Apps[*super]
+      end
+
       def sole_environment
         if environments.size == 1
           environments.first

data/lib/engineyard/model/environment.rb

@@ -13,7 +13,7 @@ module EY
         end
       end
 
-      def self.from_array(array, extras={})
+      def self.from_array(*)
         Collection::Environments[*super]
       end
 

data/lib/engineyard/model/instance.rb

@@ -56,6 +56,10 @@ module EY
       end
 
 
+      def has_app_code?
+        !["db_master", "db_slave"].include?(role.to_s)
+      end
+
       def ensure_eysd_present
         case ey_deploy_check
         when :ssh_failed
@@ -110,7 +114,9 @@ module EY
 
       def invoke_eysd_deploy(deploy_args, verbose=false)
         start = [eysd_path, "_#{EYSD_VERSION}_", 'deploy']
-        instance_args = environment.instances.inject(['--instances']) do |command, inst|
+        instance_args = environment.instances.find_all do |inst|
+          inst.has_app_code?
+        end.inject(['--instances']) do |command, inst|
           instance_tuple = [inst.public_hostname, inst.role]
           instance_tuple << inst.name if inst.name
 

data/lib/engineyard/repo.rb

@@ -1,3 +1,5 @@
+require 'escape'
+
 module EY
   class Repo
 
@@ -19,7 +21,7 @@ module EY
     end
 
     def urls
-      lines = `git config -f #{@path}/.git/config --get-regexp 'remote.*.url'`.split(/\n/)
+      lines = `git config -f #{Escape.shell_command(@path)}/.git/config --get-regexp 'remote.*.url'`.split(/\n/)
       raise NoRemotesError.new(@path) if lines.empty?
       lines.map { |c| c.split.last }
     end

data/lib/engineyard/thor.rb

@@ -102,7 +102,11 @@ module EY
     end
 
     def fetch_app(app_name = nil)
-      api.fetch_app!(app_name) || api.app_for_repo!(repo)
+      if app_name
+        api.apps.match_one!(app_name)
+      else
+        api.app_for_repo!(repo)
+      end      
     end
 
     def get_apps(all_apps = false)

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.8.2'
+  VERSION = '0.9.0'
 end

data/spec/engineyard/collection/apps.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe EY::Collection::Apps do
+  before do
+    @collection_class = EY::Collection::Apps
+    @collection = @collection_class.new([
+      EY::Model::App.from_hash("id" => 1234, "name" => "app_production"),
+      EY::Model::App.from_hash("id" => 4321, "name" => "app_staging"),
+      EY::Model::App.from_hash("id" => 8765, "name" => "bigapp_staging"),
+    ])
+  end
+
+    it_should_behave_like "model collections"
+end

data/spec/engineyard/collection/environments.rb

@@ -1,75 +1,14 @@
 require 'spec_helper'
 
 describe EY::Collection::Environments do
-  before(:each) do
-    @envs = described_class.new([
+  before do
+    @collection_class = EY::Collection::Environments
+    @collection = @collection_class.new([
       EY::Model::Environment.from_hash("id" => 1234, "name" => "app_production"),
       EY::Model::Environment.from_hash("id" => 4321, "name" => "app_staging"),
       EY::Model::Environment.from_hash("id" => 8765, "name" => "bigapp_staging"),
     ])
   end
 
-  describe "#match_one" do
-    it "works when given an unambiguous substring" do
-      @envs.match_one("prod").name.should == "app_production"
-    end
-
-    it "raises an error when given an ambiguous substring" do
-      lambda {
-        @envs.match_one("staging")
-      }.should raise_error(EY::AmbiguousEnvironmentName)
-    end
-
-    it "returns an exact match if one exists" do
-      @envs.match_one("app_staging").name.should == "app_staging"
-    end
-
-    it "returns nil when it can't find anything" do
-      @envs.match_one("dev-and-production").should be_nil
-    end
-  end
-
-  describe "#match_one!" do
-    it "works when given an unambiguous substring" do
-      @envs.match_one!("prod").name.should == "app_production"
-    end
-
-    it "raises an error when given an ambiguous substring" do
-      lambda {
-        @envs.match_one!("staging")
-      }.should raise_error(EY::AmbiguousEnvironmentName)
-    end
-
-    it "returns an exact match if one exists" do
-      @envs.match_one!("app_staging").name.should == "app_staging"
-    end
-
-    it "raises an error when it can't find anything" do
-      lambda {
-        @envs.match_one!("dev-and-production")
-      }.should raise_error(EY::EnvironmentError)
-    end
-  end
-
-  describe "#named" do
-    it "finds the environment with the matching name" do
-      @envs.named("app_staging").id.should == 4321
-    end
-
-    it "returns nil when no name matches" do
-      @envs.named("something else").should be_nil
-    end
-  end
-
-  describe "#named!" do
-    it "finds the environment with the matching name" do
-      @envs.named!("app_staging").id.should == 4321
-    end
-
-    it "raises an error when no name matches" do
-      lambda {
-        @envs.named!("something else")
-      }.should raise_error(EY::EnvironmentError)
-    end
-  end
+  it_should_behave_like "model collections"
 end

data/spec/engineyard/model/instance_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "EY::Model::Instance#has_app_code?" do
+
+  def have_app_code
+    simple_matcher("has app code") { |given| given.has_app_code? }
+  end
+
+  it "is true for solos" do
+    EY::Model::Instance.from_hash("role" => "solo").should have_app_code
+  end
+
+  it "is true for app masters" do
+    EY::Model::Instance.from_hash("role" => "app_master").should have_app_code
+  end
+
+  it "is true for app slaves" do
+    EY::Model::Instance.from_hash("role" => "app").should have_app_code
+  end
+
+  it "is true for utilities" do
+    EY::Model::Instance.from_hash("role" => "util").should have_app_code
+  end
+
+  it "is false for DB masters" do
+    EY::Model::Instance.from_hash("role" => "db_master").should_not have_app_code
+  end
+
+  it "is false for DB slaves" do
+    EY::Model::Instance.from_hash("role" => "db_slave").should_not have_app_code
+  end
+end

data/spec/support/shared_behavior.rb

@@ -126,17 +126,21 @@ shared_examples_for "it invokes eysd" do
     it "passes along instance information to eysd" do
       instance_args = [
         Regexp.quote("ec2-174-129-198-124.compute-1.amazonaws.com,app_master"),
-        Regexp.quote("ec2-174-129-142-53.compute-1.amazonaws.com,db_master"),
         Regexp.quote("ec2-72-44-46-66.compute-1.amazonaws.com,app"),
         Regexp.quote("ec2-184-73-116-228.compute-1.amazonaws.com,util,fluffy"),
       ]
 
-      # they should all be mentioned
+      db_instance = Regexp.quote("ec2-174-129-142-53.compute-1.amazonaws.com,db_master")
+
+      # apps + utilities are all mentioned
       instance_args.each do |i|
         @ssh_commands.last.should =~ /#{i}/
       end
 
-      # after the option '--instances'
+      # but not database instances
+      @ssh_commands.last.should_not =~ /#{db_instance}/
+
+      # and it's all after the option '--instances'
       @ssh_commands.last.should match(/--instances (#{instance_args.join('|')})/)
     end
 
@@ -186,5 +190,59 @@ shared_examples_for "it invokes eysd" do
       ver = Regexp.quote(EY::Model::Instance::EYSD_VERSION)
       @ssh_commands.should have_command_like(/eysd _#{ver}_ deploy/)
     end
+  end  
+end
+
+shared_examples_for "model collections" do
+  describe "#match_one" do
+    it "works when given an unambiguous substring" do
+      @collection.match_one("prod").name.should == "app_production"
+    end
+
+    it "raises an error when given an ambiguous substring" do
+      lambda {
+        @collection.match_one("staging")
+      }.should raise_error(@collection_class.ambiguous_error)
+    end
+
+    it "returns an exact match if one exists" do
+      @collection.match_one("app_staging").name.should == "app_staging"
+    end
+
+    it "returns nil when it can't find anything" do
+      @collection.match_one("dev-and-production").should be_nil
+    end
+  end
+
+  describe "#match_one!" do
+    it "works when given an unambiguous substring" do
+      @collection.match_one!("prod").name.should == "app_production"
+    end
+
+    it "raises an error when given an ambiguous substring" do
+      lambda {
+        @collection.match_one!("staging")
+      }.should raise_error(@collection_class.ambiguous_error)
+    end
+
+    it "returns an exact match if one exists" do
+      @collection.match_one!("app_staging").name.should == "app_staging"
+    end
+
+    it "raises an error when it can't find anything" do
+      lambda {
+        @collection.match_one!("dev-and-production")
+      }.should raise_error(@collection_class.invalid_error)
+    end
+  end
+
+  describe "#named" do
+    it "finds matching by name" do
+      @collection.named("app_staging").name.should == "app_staging"
+    end
+
+    it "returns nil when no name matches" do
+      @collection.named("something else").should be_nil
+    end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 2
-  version: 0.8.2
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -07:00
+date: 2010-07-07 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,8 @@ files:
 - 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
@@ -192,10 +194,12 @@ test_files:
 - spec/engineyard/api_spec.rb
 - spec/engineyard/cli/api_spec.rb
 - spec/engineyard/cli_spec.rb
+- spec/engineyard/collection/apps.rb
 - spec/engineyard/collection/environments.rb
 - spec/engineyard/config_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_spec.rb
 - spec/ey/deploy_spec.rb