ey_resolver 0.2.0 → 0.2.1

data/lib/ey_resolver/abstract_resolver.rb

@@ -16,22 +16,40 @@ class EY::Resolver
     end
 
     def matches
+      @matches ||= load_matches
+    end
+
+    def errors
+      @errors ||= load_errors
+    end
+
+    def suggestions
+      @suggestions ||= load_suggestions
+    end
+
+    protected
+
+    def load_matches
       if query.unconstrained?
         return []
       end
     end
 
-    def errors
+    def load_errors
+      if matches.any?
+        return []
+      end
       examiner.unconstrained_errors
     end
 
-    def suggestions
+    def load_suggestions
+      if matches.any?
+        return []
+      end
       errors
       examiner.suggestions
     end
 
-    protected
-
     def examiner
       @examiner ||= Examiner.new(query, user)
     end

data/lib/ey_resolver/account_resolver.rb

@@ -10,7 +10,9 @@ class EY::Resolver
       ::Account
     end
 
-    def matches
+    protected
+
+    def load_matches
       if query.unconstrained?
         return []
       end
@@ -21,15 +23,12 @@ class EY::Resolver
       best_matches user.accounts.all(dm_query)
     end
 
-    def errors
-      @errors ||=
-        super ||
+    def load_errors
+      super ||
         examiner.not_found_errors ||
         []
     end
 
-    private
-
     def exact_match?(account, key, val)
       case key.to_sym
       when :remotes

data/lib/ey_resolver/app_env_resolver.rb

@@ -7,23 +7,25 @@ class EY::Resolver
 
   class AppEnvResolver < AbstractResolver
 
-    def self.association
+    def self.model
       if Object.const_defined?(:AppDeployment)
-        :app_deployments
+        ::AppDeployment
       else
-        :app_environments
+        ::AppEnvironment
       end
     end
 
-    def self.model
-      if Object.const_defined?(:AppDeployment)
-        ::AppDeployment
+    protected
+
+    def association
+      if model.name =~ /AppDeployment/
+        :app_deployments
       else
-        ::AppEnvironment
+        :app_environments
       end
     end
 
-    def matches
+    def load_matches
       if query.unconstrained? || query.app_unconstrained?
         return []
       end
@@ -33,13 +35,12 @@ class EY::Resolver
       dm_query[model.environment.name.like] = "%#{query.environment_name}%" if query.environment_name
       dm_query[model.app.account.name.like] = "%#{query.account_name}%"     if query.account_name
 
-      candidates = user.accounts.apps.send(self.class.association).all(dm_query)
+      candidates = user.accounts.apps.send(association).all(dm_query)
       best_matches filter_by_remotes(candidates)
     end
 
-    def errors
-      @errors ||=
-        super ||
+    def load_errors
+      super ||
         examiner.app_unconstrained_errors ||
         examiner.not_found_errors ||
         examiner.account_scoping_errors ||
@@ -48,8 +49,6 @@ class EY::Resolver
         []
     end
 
-    private
-
     def equivalent_remote?(app_env, uri)
       app_env.app.gitable_uri.equivalent?(uri)
     end

data/lib/ey_resolver/app_resolver.rb

@@ -10,7 +10,9 @@ class EY::Resolver
       ::App
     end
 
-    def matches
+    protected
+
+    def load_matches
       if query.unconstrained? || query.app_unconstrained?
         return []
       end
@@ -23,17 +25,14 @@ class EY::Resolver
       best_matches filter_by_remotes(candidates)
     end
 
-    def errors
-      @errors ||=
-        super ||
+    def load_errors
+      super ||
         examiner.app_unconstrained_errors ||
         examiner.not_found_errors ||
         examiner.account_scoping_errors ||
         []
     end
 
-    protected
-
     def equivalent_remote?(app, uri)
       app.gitable_uri.equivalent?(uri)
     end

data/lib/ey_resolver/environment_resolver.rb

@@ -10,7 +10,9 @@ class EY::Resolver
       ::Environment
     end
 
-    def matches
+    protected
+
+    def load_matches
       if query.unconstrained? || query.env_unconstrained?
         return []
       end
@@ -30,9 +32,8 @@ class EY::Resolver
       best_matches candidates
     end
 
-    def errors
-      @errors ||=
-        super ||
+    def load_errors
+      super ||
         examiner.env_unconstrained_errors ||
         examiner.not_found_errors ||
         examiner.account_scoping_errors ||
@@ -41,8 +42,6 @@ class EY::Resolver
         []
     end
 
-    private
-
     # cache app uris since we might use it twice
     def app_uris(env)
       @app_uris ||= {}

data/lib/ey_resolver/version.rb

@@ -1,5 +1,5 @@
 module EY
   class Resolver
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/account_resolver_spec.rb

@@ -76,27 +76,15 @@ describe EY::Resolver::AppEnvResolver do
   describe "#errors" do
     it "no account" do
       resolver = account_resolver('gibberish', 'app', 'production')
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No account found matching "gibberish".|]
       resolver.suggestions.should == []
     end
 
-    it "no app" do
-      resolver = account_resolver(nil, 'gibberish', 'app_dup')
-      resolver.errors.should ==
-        [%|No application found matching "gibberish".|]
-      resolver.suggestions.should == []
-    end
-
-    it "no env" do
-      resolver = account_resolver('ey', 'app', 'gibberish')
-      resolver.errors.should ==
-        [%|No environment found matching "gibberish".|]
-      resolver.suggestions.should == []
-    end
-
     it "no account or app" do
       resolver = account_resolver('gibberish', 'gibberish', nil)
+      resolver.matches.should == []
       resolver.errors.should == [
         %|No account found matching "gibberish".|,
         %|No application found matching "gibberish".|,
@@ -106,6 +94,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "no account or app or env" do
       resolver = account_resolver('gibberish', 'gibberish', 'gibberish')
+      resolver.matches.should == []
       resolver.errors.should == [
         %|No account found matching "gibberish".|,
         %|No application found matching "gibberish".|,
@@ -113,12 +102,5 @@ describe EY::Resolver::AppEnvResolver do
       ]
       resolver.suggestions.should == []
     end
-
-    it "repo not found" do
-      resolver = account_resolver(nil, nil, nil, ["git://fake.com/fake/fake.git"])
-      resolver.errors.should ==
-        [%|No application found matching remotes:\n\tgit://fake.com/fake/fake.git|]
-      resolver.suggestions.should == []
-    end
   end
 end

data/spec/app_env_resolver_spec.rb

@@ -75,6 +75,7 @@ describe EY::Resolver::AppEnvResolver do
   describe "errors and suggestions" do
     it "no constraints" do
       resolver = app_env_resolver()
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|Must search by account name, app name, remotes, or environment name.|]
       resolver.suggestions.should be_empty
@@ -82,6 +83,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "no app constraints" do
       resolver = app_env_resolver('ey')
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|App name or repository remotes required.|]
       resolver.suggestions.should be_empty
@@ -89,6 +91,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "no account" do
       resolver = app_env_resolver('gibberish', 'app', 'production')
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No account found matching "gibberish".|]
       resolver.suggestions.should be_empty
@@ -96,6 +99,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "no app" do
       resolver = app_env_resolver(nil, 'gibberish', 'app_dup')
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No application found matching "gibberish".|]
       resolver.suggestions.should be_empty
@@ -103,6 +107,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "app found, but not on account" do
       resolver = app_env_resolver('no', 'bigapp', 'app_dup')
+      resolver.matches.should == []
       resolver.errors.should == [
         %|Application "bigapp" found, but does not exist in account "no".|,
         %|Environment "app_dup" found, but does not exist in account "no".|,
@@ -117,6 +122,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "no env" do
       resolver = app_env_resolver('ey', 'app', 'gibberish')
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No environment found matching "gibberish".|]
       resolver.suggestions.should be_empty
@@ -124,6 +130,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "no env on account" do
       resolver = app_env_resolver('me', 'other', 'production')
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|Environment "production" found, but does not exist in account "me".|]
       resolver.suggestions.should =~ [
@@ -133,6 +140,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "no account or app" do
       resolver = app_env_resolver('gibberish', 'gibberish', nil)
+      resolver.matches.should == []
       resolver.errors.should == [
         %|No account found matching "gibberish".|,
         %|No application found matching "gibberish".|,
@@ -142,6 +150,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "no account or app or env" do
       resolver = app_env_resolver('gibberish', 'gibberish', 'gibberish')
+      resolver.matches.should == []
       resolver.errors.should == [
         %|No account found matching "gibberish".|,
         %|No application found matching "gibberish".|,
@@ -152,6 +161,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "repo not found" do
       resolver = app_env_resolver(nil, nil, nil, ["git://fake.com/fake/fake.git"])
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No application found matching remotes:\n\tgit://fake.com/fake/fake.git|]
       resolver.suggestions.should be_empty
@@ -159,6 +169,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "repo not found in account" do
       resolver = app_env_resolver('ey', nil, nil, ["git://github.com/repo/oth.git"])
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|Application "other" found, but does not exist in account "ey".|]
       resolver.suggestions.should =~
@@ -166,17 +177,19 @@ describe EY::Resolver::AppEnvResolver do
     end
 
     it "app and environment not associated" do
-      resolver = app_env_resolver('ey', 'bigapp', 'app_staging')
+      resolver = app_env_resolver('ey', 'bigapp', 'app_production')
+      resolver.matches.should == []
       resolver.errors.should ==
-        [%|Application "bigapp" and environment "app_staging" are not associated.|]
+        [%|Application "bigapp" and environment "app_production" are not associated.|]
       resolver.suggestions.should =~ [
         {'account_name' => 'ey', 'app_name' => 'bigapp', 'environment_name' => 'bigapp_staging'},
-        {'account_name' => 'ey', 'app_name' => 'app', 'environment_name' => 'app_staging'}
+        {'account_name' => 'ey', 'app_name' => 'app', 'environment_name' => 'app_production'}
       ]
     end
 
     it "another app and environment not associated" do
       resolver = app_env_resolver(nil, nil, 'app_dup', ["git://github.com/repo/app.git"])
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|Application "app" and environment "app_dup" are not associated.|]
       resolver.suggestions.should =~ [
@@ -187,6 +200,7 @@ describe EY::Resolver::AppEnvResolver do
 
     it "app (by repo) does not have an environment" do
       resolver = app_env_resolver(nil, nil, nil, ["git://github.com/repo/noe.git"])
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No environment found for applications matching remotes:\n\tgit://github.com/repo/noe.git|]
       resolver.suggestions.should be_empty

data/spec/app_resolver_spec.rb

@@ -65,41 +65,41 @@ describe EY::Resolver::AppEnvResolver do
 
   describe "#errors" do
     it "no account" do
-      app_resolver('gibberish', 'app', 'production').errors.should ==
+      resolver = app_resolver('gibberish', 'app', 'production')
+      resolver.matches.should == []
+      resolver.errors.should ==
         [%|No account found matching "gibberish".|]
     end
 
     it "no app" do
-      app_resolver(nil, 'gibberish', 'app_dup').errors.should ==
+      resolver = app_resolver(nil, 'gibberish', 'app_dup')
+      resolver.matches.should == []
+      resolver.errors.should ==
         [%|No application found matching "gibberish".|]
     end
 
     it "app found, but not on account" do
-      app_resolver('no', 'bigapp', 'app_dup').errors.should == [
+      resolver = app_resolver('no', 'bigapp', 'app_dup')
+      resolver.matches.should == []
+      resolver.errors.should == [
         %|Application "bigapp" found, but does not exist in account "no".|,
         %|Environment "app_dup" found, but does not exist in account "no".|,
       ]
     end
 
-    it "no env" do
-      app_resolver('ey', 'app', 'gibberish').errors.should ==
-        [%|No environment found matching "gibberish".|]
-    end
-
-    it "no env on account" do
-      app_resolver('me', 'other', 'production').errors.should ==
-        [%|Environment "production" found, but does not exist in account "me".|]
-    end
-
     it "no account or app" do
-      app_resolver('gibberish', 'gibberish', nil).errors.should == [
+      resolver = app_resolver('gibberish', 'gibberish', nil)
+      resolver.matches.should == []
+      resolver.errors.should == [
         %|No account found matching "gibberish".|,
         %|No application found matching "gibberish".|,
       ]
     end
 
     it "no account or app or env" do
-      app_resolver('gibberish', 'gibberish', 'gibberish').errors.should == [
+      resolver = app_resolver('gibberish', 'gibberish', 'gibberish')
+      resolver.matches.should == []
+      resolver.errors.should == [
         %|No account found matching "gibberish".|,
         %|No application found matching "gibberish".|,
         %|No environment found matching "gibberish".|,
@@ -107,12 +107,16 @@ describe EY::Resolver::AppEnvResolver do
     end
 
     it "repo not found" do
-      app_resolver(nil, nil, nil, ["git://fake.com/fake/fake.git"]).errors.should ==
+      resolver = app_resolver(nil, nil, nil, ["git://fake.com/fake/fake.git"])
+      resolver.matches.should == []
+      resolver.errors.should ==
         [%|No application found matching remotes:\n\tgit://fake.com/fake/fake.git|]
     end
 
     it "repo not found in account" do
-      app_resolver('ey', nil, nil, ["git://github.com/repo/oth.git"]).errors.should ==
+      resolver = app_resolver('ey', nil, nil, ["git://github.com/repo/oth.git"])
+      resolver.matches.should == []
+      resolver.errors.should ==
         [%|Application "other" found, but does not exist in account "ey".|]
     end
 

data/spec/environment_resolver_spec.rb

@@ -85,6 +85,7 @@ describe EY::Resolver::EnvironmentResolver do
   describe "errors and suggestions" do
     it "no account" do
       resolver = env_resolver('gibberish', 'app', 'production')
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No account found matching "gibberish".|]
       resolver.suggestions.should be_empty
@@ -92,6 +93,7 @@ describe EY::Resolver::EnvironmentResolver do
 
     it "no app" do
       resolver = env_resolver(nil, 'gibberish', 'app_dup')
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No application found matching "gibberish".|]
       resolver.suggestions.should be_empty
@@ -99,6 +101,7 @@ describe EY::Resolver::EnvironmentResolver do
 
     it "app found, but not on account" do
       resolver = env_resolver('no', 'bigapp', 'app_dup')
+      resolver.matches.should == []
       resolver.errors.should == [
         %|Application "bigapp" found, but does not exist in account "no".|,
         %|Environment "app_dup" found, but does not exist in account "no".|,
@@ -113,6 +116,7 @@ describe EY::Resolver::EnvironmentResolver do
 
     it "no env" do
       resolver = env_resolver('ey', nil, 'gibberish')
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No environment found matching "gibberish".|]
       resolver.suggestions.should be_empty
@@ -120,6 +124,7 @@ describe EY::Resolver::EnvironmentResolver do
 
     it "no env on account" do
       resolver = env_resolver('no', nil, 'app_dup')
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|Environment "app_dup" found, but does not exist in account "no".|]
       resolver.suggestions.should =~ [
@@ -131,6 +136,7 @@ describe EY::Resolver::EnvironmentResolver do
 
     it "no account or app" do
       resolver = env_resolver('gibberish', 'gibberish', nil)
+      resolver.matches.should == []
       resolver.errors.should == [
         %|No account found matching "gibberish".|,
         %|No application found matching "gibberish".|,
@@ -140,6 +146,7 @@ describe EY::Resolver::EnvironmentResolver do
 
     it "no account or app or env" do
       resolver = env_resolver('gibberish', 'gibberish', 'gibberish')
+      resolver.matches.should == []
       resolver.errors.should == [
         %|No account found matching "gibberish".|,
         %|No application found matching "gibberish".|,
@@ -150,6 +157,7 @@ describe EY::Resolver::EnvironmentResolver do
 
     it "repo not found" do
       resolver = env_resolver(nil, nil, nil, ["git://fake.com/fake/fake.git"])
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No application found matching remotes:\n\tgit://fake.com/fake/fake.git|]
       resolver.suggestions.should be_empty
@@ -157,6 +165,7 @@ describe EY::Resolver::EnvironmentResolver do
 
     it "repo found but env doesn't exist on it" do
       resolver = env_resolver(nil, nil, nil, ["git://github.com/repo/noe.git"])
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No environment found for applications matching remotes:\n\tgit://github.com/repo/noe.git|]
       resolver.suggestions.should be_empty
@@ -164,6 +173,7 @@ describe EY::Resolver::EnvironmentResolver do
 
     it "repo not found in account" do
       resolver = env_resolver('ey', nil, nil, ["git://github.com/repo/oth.git"])
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|Application "other" found, but does not exist in account "ey".|]
       resolver.suggestions.should =~
@@ -172,6 +182,7 @@ describe EY::Resolver::EnvironmentResolver do
 
     it "app and environment not associated" do
       resolver = env_resolver('ey', 'bigapp', 'app_dup')
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|Application "bigapp" and environment "app_dup" are not associated.|]
       resolver.suggestions.should =~ [
@@ -180,18 +191,9 @@ describe EY::Resolver::EnvironmentResolver do
       ]
     end
 
-    it "app (by repo) and environment not associated" do
-      resolver = env_resolver(nil, nil, 'app_dup', ["git://github.com/repo/app.git"])
-      resolver.errors.should ==
-        [%|Application "app" and environment "app_dup" are not associated.|]
-      resolver.suggestions.should =~ [
-        {"account_name"=>"ey", 'app_name' => 'app', "environment_name"=>"app_production"},
-        {"account_name"=>"ey", 'app_name' => 'app', "environment_name"=>"app_staging"}
-      ]
-    end
-
     it "app (by repo) does not have an environment" do
       resolver = env_resolver(nil, nil, nil, ["git://github.com/repo/noe.git"])
+      resolver.matches.should == []
       resolver.errors.should ==
         [%|No environment found for applications matching remotes:\n\tgit://github.com/repo/noe.git|]
       resolver.suggestions.should be_empty

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ey_resolver
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitable
-  requirement: &70293599453000 !ruby/object:Gem::Requirement
+  requirement: &70189243891520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70293599453000
+  version_requirements: *70189243891520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70293599452580 !ruby/object:Gem::Requirement
+  requirement: &70189243891100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293599452580
+  version_requirements: *70189243891100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70293599452040 !ruby/object:Gem::Requirement
+  requirement: &70189243890560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70293599452040
+  version_requirements: *70189243890560
 description: Resolves apps, environments, app_environments and accounts using a set
   of constraints
 email:
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4423758491052706735
+      hash: 4321533697507775913
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4423758491052706735
+      hash: 4321533697507775913
 requirements: []
 rubyforge_project: ey_resolver
 rubygems_version: 1.8.15