ey_resolver 0.2.1 → 0.2.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTg2YThiMjMyZWFkZDAwOGFkM2VmYjI1NjM3ZmU1NDUwZjFjNzMxNA==
+  data.tar.gz: !binary |-
+    ZDFmMjA1MTQ0YjU4NjAxN2E2Mzk0MjNjNjc3MGRiZDZlOTU4ZmUxMQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDA5Yzk4Njc0MTllNDE3MjYxZWU4NDhhN2UwYmE0ZmZlNmI5N2MxNGU1ODc1
+    MTExMDMxMTFjOGY5ZWZjYmU0OTViNjE5NmQ1OWVjODgxNzEwOGNkMjYyMmFj
+    ZDEwYzFjY2I5YWYyZTljZGZlMjI2MzRlNzFhYjVjYmJiMWVkYTE=
+  data.tar.gz: !binary |-
+    NWE2ZDAxNjFkOWQ5NDQzNjc0YjU1YzRmOGVlOWYyODQ5YmM3NTVmMDMzNDJl
+    MTE0YmZkNDJlM2YyMDg1MWY2NWEwN2VkYjU3ZDQ0MWZmMjA2Zjg2YWVlYTQx
+    NWQzZTAzZWIxNjVkYmJiYzRkYzQ4NWNhZmYwODZiNDc1YWRkYjg=

data/ey_resolver.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency "gitable", "~>0.2.3"
+  s.add_runtime_dependency "gitable", "~>0.2.4"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~>2.0"
 end

data/lib/ey_resolver.rb

@@ -1,12 +1,12 @@
+module EY
+  class Resolver
+    class UnconstrainedError < ArgumentError; end
+  end
+end
+
 require 'ey_resolver/query'
 require 'ey_resolver/examiner'
 require 'ey_resolver/account_resolver'
 require 'ey_resolver/app_resolver'
 require 'ey_resolver/app_env_resolver'
 require 'ey_resolver/environment_resolver'
-
-module EY
-  class Resolver
-    class UnconstrainedError < ArgumentError; end
-  end
-end

data/lib/ey_resolver/account_resolver.rb

@@ -32,7 +32,7 @@ class EY::Resolver
     def exact_match?(account, key, val)
       case key.to_sym
       when :remotes
-        app_uris = account.apps.map { |app| app.gitable_uri }.flatten
+        app_uris = account.apps.map { |app| app.gitable_uri }.flatten.compact
         val.any? { |uri| app_uris.any? { |app_uri| app_uri.equivalent?(uri) } }
       when :app_name
         account.apps.any? {|app| app.name.downcase.index(val.downcase) } # partial match app if given for account

data/lib/ey_resolver/app_env_resolver.rb

@@ -50,7 +50,7 @@ class EY::Resolver
     end
 
     def equivalent_remote?(app_env, uri)
-      app_env.app.gitable_uri.equivalent?(uri)
+      app_env.app.gitable_uri && app_env.app.gitable_uri.equivalent?(uri)
     end
 
     def exact_match?(app_env, key, val)

data/lib/ey_resolver/app_resolver.rb

@@ -34,7 +34,7 @@ class EY::Resolver
     end
 
     def equivalent_remote?(app, uri)
-      app.gitable_uri.equivalent?(uri)
+      app.gitable_uri && app.gitable_uri.equivalent?(uri)
     end
 
     def exact_match?(app, key, val)

data/lib/ey_resolver/environment_resolver.rb

@@ -45,7 +45,7 @@ class EY::Resolver
     # cache app uris since we might use it twice
     def app_uris(env)
       @app_uris ||= {}
-      @app_uris[env] ||= env.apps.map { |app| app.gitable_uri }.flatten
+      @app_uris[env] ||= env.apps.map { |app| app.gitable_uri }.flatten.compact
     end
 
     def equivalent_remote?(env, uri)

data/lib/ey_resolver/query.rb

@@ -63,6 +63,7 @@ class EY::Resolver
         return nil if val.nil? || val.empty?
         val.reject {|uri| uri.to_s.empty? }.map { |uri| Gitable::URI.parse_when_valid(uri) }.compact
       else
+        # allowable characters assumption: [a-zA-Z0-9_-]
         norm = val.to_s.gsub(/[^\w-]+/,'')
         norm.empty? ? nil : norm
       end

data/lib/ey_resolver/version.rb

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

data/spec/app_env_resolver_spec.rb

@@ -199,10 +199,10 @@ describe EY::Resolver::AppEnvResolver do
     end
 
     it "app (by repo) does not have an environment" do
-      resolver = app_env_resolver(nil, nil, nil, ["git://github.com/repo/noe.git"])
+      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|]
+        [%|No environment found for applications matching remotes:\n\tgit@github.com:repo/noe.git|]
       resolver.suggestions.should be_empty
     end
   end

data/spec/app_resolver_spec.rb

@@ -107,10 +107,10 @@ describe EY::Resolver::AppEnvResolver do
     end
 
     it "repo not found" do
-      resolver = app_resolver(nil, nil, nil, ["git://fake.com/fake/fake.git"])
+      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|]
+        [%|No application found matching remotes:\n\tgit@fake.com:fake/fake.git|]
     end
 
     it "repo not found in account" do

data/spec/environment_resolver_spec.rb

@@ -24,7 +24,7 @@ describe EY::Resolver::EnvironmentResolver do
     end
 
     it "returns empty when there is no remote match and env name is not specified" do
-      env_resolver(nil, nil, nil, ["git://github.com/repo/noe.git"]).matches.should == []
+      env_resolver(nil, nil, nil, ["git@github.com:repo/noe.git"]).matches.should == []
     end
 
     it "returns empty when there is no environment match" do
@@ -47,7 +47,7 @@ describe EY::Resolver::EnvironmentResolver do
 
     it "finds matches that don't match the remotes" do
       env_resolver(nil,   nil, 'production', ["git://github.com/repo/app.git"]).matches.should == envs(@production, @hugeprod)
-      env_resolver(nil,   nil, 'staging',    ["git://github.com/repo/noe.git"]).matches.should == envs(@staging, @big)
+      env_resolver(nil,   nil, 'staging',    ["git@github.com:repo/noe.git"]).matches.should == envs(@staging, @big)
     end
 
     it "scopes by app name when specified" do
@@ -164,10 +164,10 @@ describe EY::Resolver::EnvironmentResolver do
     end
 
     it "repo found but env doesn't exist on it" do
-      resolver = env_resolver(nil, nil, nil, ["git://github.com/repo/noe.git"])
+      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|]
+        [%|No environment found for applications matching remotes:\n\tgit@github.com:repo/noe.git|]
       resolver.suggestions.should be_empty
     end
 
@@ -192,10 +192,10 @@ describe EY::Resolver::EnvironmentResolver do
     end
 
     it "app (by repo) does not have an environment" do
-      resolver = env_resolver(nil, nil, nil, ["git://github.com/repo/noe.git"])
+      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|]
+        [%|No environment found for applications matching remotes:\n\tgit@github.com:repo/noe.git|]
       resolver.suggestions.should be_empty
     end
   end

data/spec/spec_helper.rb

@@ -27,10 +27,6 @@ module Helpers
       raise "Must have an account"
     end
 
-    if !!app_name != !!repo # both or neither (XNOR)
-      raise "app_name and repo must be supplied together"
-    end
-
     account =   Account.first(:user => user, :name => acc_name)
     account ||= Account.create(:user => user, :name => acc_name)
 
@@ -110,7 +106,8 @@ RSpec.configure do |config|
     @me_dup     = mock_models('me', "app_dup", "app_dup",        "git://github.com/repo/dup.git")
     @me_other   = mock_models('me', "other",   "app_dup",        "git://github.com/repo/oth.git")
     @noapp      = mock_models('ey',  nil,      "noapp",           nil)
-    @noenv      = mock_models('ey', "noenv",    nil,             "git://github.com/repo/noe.git")
+    @norepo     = mock_models('ey', "herring", "herring",         nil)
+    @noenv      = mock_models('ey', "noenv",    nil,             "git@github.com:repo/noe.git")
     @account    = mock_models('no',  nil,       nil,              nil)
   end
 end

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ey_resolver
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Martin Emde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitable
-  requirement: &70189243891520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70189243891520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70189243891100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189243891100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70189243890560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70189243890560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Resolves apps, environments, app_environments and accounts using a set
   of constraints
 email:
@@ -80,33 +88,26 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4321533697507775913
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4321533697507775913
 requirements: []
 rubyforge_project: ey_resolver
-rubygems_version: 1.8.15
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Resolves awsm models given constraints
 test_files:
 - spec/account_resolver_spec.rb