engineyard 1.3.2 → 1.3.3

data/lib/engineyard/api.rb

@@ -35,6 +35,7 @@ module EY
     end
 
     def apps_for_repo(repo)
+      raise NoRemotesError.new(repo.path) if repo.urls.empty?
       apps.find_all {|a| repo.urls.include?(a.repository_uri) }
     end
 

data/lib/engineyard/cli.rb

@@ -9,8 +9,6 @@ module EY
     autoload :Recipes, 'engineyard/cli/recipes'
     autoload :Web,     'engineyard/cli/web'
 
-    check_unknown_options!
-
     include Thor::Actions
 
     def self.start(*)

data/lib/engineyard/repo.rb

@@ -3,6 +3,8 @@ require 'escape'
 module EY
   class Repo
 
+    attr_reader :path
+
     def initialize(path=File.expand_path('.'))
       @path = path
     end
@@ -26,7 +28,6 @@ module EY
 
     def urls
       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/resolver.rb

@@ -99,7 +99,7 @@ module EY
       app_candidates = if options[:app_name]
                          filter_candidates_by(:app_name, options, candidates)
                        elsif options[:repo]
-                         candidates.select {|c| options[:repo].urls.include?(c[:repository_uri]) }
+                         filter_by_repo(candidates, options[:repo])
                        else
                          candidates
                        end
@@ -109,6 +109,18 @@ module EY
       [candidates, account_candidates, app_candidates, environment_candidates]
     end
 
+    def filter_by_repo(candidates, repo)
+      results = candidates.select do |c|
+        repo.urls.include?(c[:repository_uri])
+      end
+
+      if results.empty?
+        candidates
+      else
+        results
+      end
+    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] }

data/lib/engineyard/thor.rb

@@ -44,6 +44,8 @@ module EY
   class Thor < ::Thor
     include UtilityMethods
 
+    check_unknown_options!
+
     no_tasks do
       def self.subcommand_help(cmd)
         desc "#{cmd} help [COMMAND]", "Describe all subcommands or one specific subcommand."

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

data/spec/engineyard/repo_spec.rb

@@ -32,11 +32,6 @@ describe EY::Repo do
       @r.urls.should include(other_url)
     end
 
-    it "raises EY::NoRemotesError if there is no origin remote" do
-      clear_urls
-      lambda { @r.urls }.should raise_error(EY::NoRemotesError)
-    end
-
     def config_path
       @path+"config"
     end

data/spec/engineyard/resolver_spec.rb

@@ -59,10 +59,6 @@ describe EY::Resolver do
       lambda { resolver.app_and_environment(:environment_name => 'app_duplicate', :app_name => 'smallapp') }.should raise_error(EY::InvalidAppError)
     end
 
-    it "raises when the git repo does not match any apps" do
-      lambda { resolver.app_and_environment(:environment_name => 'app_duplicate', :repo => repo("git://github.com/no-such/app.git")) }.should raise_error(EY::NoAppError)
-    end
-
     it "raises when there is no environment match" do
       lambda { resolver.app_and_environment(:environment_name => 'gibberish', :app_name => 'app') }.should raise_error(EY::NoEnvironmentError)
     end

data/spec/ey/recipes/apply_spec.rb

@@ -15,6 +15,11 @@ describe "ey recipes apply" do
   end
 
   it_should_behave_like "it takes an environment name and an account name"
+
+  it "fails when given a bad option" do
+    ey "web enable --lots --of --bogus --options", :expect_failure => true
+    @err.should include("Unknown switches")
+  end
 end
 
 describe "ey recipes apply with an ambiguous git repo" do

data/spec/ey/recipes/upload_spec.rb

@@ -28,3 +28,50 @@ describe "ey recipes upload with an ambiguous git repo" do
   def command_to_run(_) "recipes upload" end
   it_should_behave_like "it requires an unambiguous git repo"
 end
+
+describe "ey recipes upload from a separate cookbooks directory" do
+  given "integration"
+
+  context "without any git remotes" do
+    define_git_repo "only cookbooks, no remotes" do |git_dir|
+      `git --git-dir "#{git_dir}/.git" remote`.split("\n").each do |remote|
+        `git --git-dir "#{git_dir}/.git" remote rm #{remote}`
+      end
+
+      git_dir.join("cookbooks").mkdir
+      File.open(git_dir.join("cookbooks/file"), "w"){|f| f << "stuff" }
+    end
+
+    use_git_repo "only cookbooks, no remotes"
+
+    it "takes the environment specified by -e" do
+      api_scenario "one app, one environment"
+
+      ey "recipes upload -e giblets"
+      @out.should =~ /Recipes uploaded successfully/
+    end
+  end
+
+  context "with a git remote unrelated to any application" do
+    define_git_repo "only cookbooks, unrelated remotes" do |git_dir|
+      `git --git-dir "#{git_dir}/.git" remote`.split("\n").each do |remote|
+        `git --git-dir "#{git_dir}/.git" remote rm #{remote}`
+      end
+
+      `git remote add origin polly@pirate.example.com:wanna/cracker.git`
+
+      git_dir.join("cookbooks").mkdir
+      File.open(git_dir.join("cookbooks/file"), "w"){|f| f << "rawk" }
+    end
+
+    use_git_repo "only cookbooks, unrelated remotes"
+
+    it "takes the environment specified by -e" do
+      api_scenario "one app, one environment"
+
+      ey "recipes upload -e giblets"
+      @out.should =~ /Recipes uploaded successfully/
+    end
+
+  end
+end

data/spec/ey/web/enable_spec.rb

@@ -18,4 +18,9 @@ describe "ey web enable" do
 
   it_should_behave_like "it takes an environment name and an app name and an account name"
   it_should_behave_like "it invokes engineyard-serverside"
+
+  it "fails when given a bad option" do
+    ey "web enable --lots --of --bogus --options", :expect_failure => true
+    @err.should include("Unknown switches")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 -07:00
+date: 2010-10-22 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,9 +31,9 @@ dependencies:
         - 3
         version: 0.14.3
   requirement: *id001
-  type: :runtime
   name: thor
   prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,9 +46,9 @@ dependencies:
         - 4
         version: "1.4"
   requirement: *id002
-  type: :runtime
   name: rest-client
   prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,9 +62,9 @@ dependencies:
         - 2
         version: 1.5.2
   requirement: *id003
-  type: :runtime
   name: highline
   prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -76,9 +76,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-  type: :runtime
   name: json_pure
   prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -92,9 +92,9 @@ dependencies:
         - 4
         version: 0.0.4
   requirement: *id005
-  type: :runtime
   name: escape
   prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -108,9 +108,9 @@ dependencies:
         - 5
         version: 1.3.5
   requirement: *id006
-  type: :runtime
   name: engineyard-serverside-adapter
   prerelease: false
+  type: :runtime
 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: