natives 0.6.0 → 0.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQxZTNmYjcyMGI5MGIxNjUzYWZiYjExYmE1MWUxMDQ3YjU2NWExNw==
+    YzhmYmZlMjMxM2UxMWYyYmNjYjY4ODZmNjlhY2Y2N2M4YjI5M2JjMA==
   data.tar.gz: !binary |-
-    ZjI4MTc0NzY1OTdjMGUyM2Q5MzJiOGU4NmRiNjEzMzc0YWZiZDViNQ==
+    MjBjZjhkNWM1MjNmNDU5NzA3MzIyMTcxMmY3Zjk5YTRhNzRmYzE1OQ==
 SHA512:
   metadata.gz: !binary |-
-    NmM1NGVmZGM0YWUzZThmMDc4NGQ3Njc2YTFiZjAyOTJmOGEzYzIwYzExNDY2
-    ZmM2Nzg2MjY0ODQzYjY4NjE1YzA2OGVjNDEyN2JmYTgzYWQ4ZDYxMjdkYjdh
-    NzcwOWVkMTM4MTI1MWZkYTMwMzkyY2Q2OGJhZmNlYjdhMmU1ZDE=
+    ZmQwOGU1YmJmNjI0YjBhMTA5NGRlZDQwMmI4ODhiNmU4ZjEwZDY3ZDZhNWUz
+    NDA3NWIxMzNmZTg3ZTBkM2NjMDM0ZmJkY2M2NDljNmNkOGY2N2ZiYWU0ZmFm
+    N2RlNTdmODYwN2JkNTRhOTEyM2EzZjI1ODkxN2E1MTA4ODZlOTA=
   data.tar.gz: !binary |-
-    ZjkzOThmY2M0OGU5NzI1NWMwMzQ2ZTMxNjllMDQwNjUwZGE4MWY4NTIwYWYx
-    OGFiYzVlMGIyOWRiNGU1YWY1NTVlZDY3NDM3MjI2ODM1NzY0MDkxNmI3ZmZj
-    MDcxODVlNmI2MWQ2M2YxNWFlMjhmNWI1M2M3ZGY4NDhhMzAxZTE=
+    YjdiNmI2MWUyYzQ2MzU0NmE2MzM0NGEyMzk5YzYzNjdhMWI3MWMzN2MzYTc0
+    YTY4NjU1MTk5MmZiODBjM2MxNzhmZWVmZWQ4ZjYwZjE1OTUyZDY0MjJmOGU5
+    ODk2YWZkYjIwYmNmNTA4YjE4MjQ2Yjg3NDg2NDAzNDAxNGY0YjI=

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/natives/catalog/selector.rb

@@ -12,17 +12,23 @@ module Natives
         platform = platform.to_s
         platform_version = platform_version.to_s
 
-        values = nil
-        platforms = @values.fetch(package_provider, nil)
-        if platforms
-          versions  = platforms.fetch(platform, nil)
-          if versions
-            values = versions.fetch(platform_version, nil) ||
-              versions.fetch('default', nil)
-          else
-            values = platforms.fetch('default', nil)
-          end
-        end
+        values = if @values.key?(package_provider) &&
+                   @values[package_provider].key?(platform) &&
+                   @values[package_provider][platform].key?(platform_version)
+
+                   @values[package_provider][platform][platform_version]
+
+                 elsif @values.key?(package_provider) &&
+                   @values[package_provider].key?(platform) &&
+                   @values[package_provider][platform].key?('default')
+
+                   @values[package_provider][platform]['default']
+
+                 elsif @values.key?(package_provider) &&
+                   @values[package_provider].key?('default')
+
+                   @values[package_provider]['default']
+                 end
 
         Array(values)
       end

data/natives.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: natives 0.6.0 ruby lib
+# stub: natives 0.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "natives"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Huiming Teo"]
-  s.date = "2013-11-18"
+  s.date = "2013-11-19"
   s.description = "Lookup native package dependencies required by gems on your machine."
   s.email = "teohuiming@gmail.com"
   s.executables = ["natives"]

data/spec/natives/catalog/normalizer_spec.rb

@@ -118,7 +118,7 @@ describe "Catalog Normalizer" do
       expect {
         normalizer.normalize({
           "macports" => {
-            "ubuntu" => nil
+            "ubuntu" => "invalid"
           }
         })
       }.to raise_error Natives::InvalidCatalogFormat

data/spec/natives/catalog/selector_spec.rb

@@ -14,6 +14,12 @@ describe Natives::Catalog::Selector do
             'default' => %w(ubuntu-default1 ubuntu-default2)
           }
         },
+        macports: {
+          default: 'macports-default',
+          mac_os_x: {
+            '10' => 'bar'
+          }
+        },
         homebrew: {
           mac_os_x: {
             '10' => 'foo'
@@ -22,30 +28,100 @@ describe Natives::Catalog::Selector do
       })
     end
 
-    it "returns values for a specific platform version" do
-      expect(selector.values_for(:apt, :ubuntu, :'12.10')).to eq(
-        ['ubuntu-12.10'])
+    it "returns values for matching platform version" do
+      selector = Natives::Catalog::Selector.new({
+        apt: {
+          ubuntu: {
+            '12.10' => 'value'
+          }
+        }
+      })
+      expect(selector.values_for(:apt, :ubuntu, '12.10')).to eq(
+        ['value'])
     end
-    it "returns a value for a specific platform version in version group" do
-      expect(selector.values_for(:apt, :ubuntu, :'10.10.1')).to eq(
-        ['ubuntu-10.10s'])
+
+    it "returns a value for matching platform version in version list" do
+      selector = Natives::Catalog::Selector.new({
+        apt: {
+          ubuntu: {
+            ['12.10.1', '12.10', '12.10.2'] => 'value'
+          }
+        }
+      })
+      expect(selector.values_for(:apt, :ubuntu, '12.10')).to eq(
+        ['value'])
     end
+
     it "returns default version values when no matching platform version" do
-      expect(selector.values_for('apt', 'ubuntu', '13')).to eq(
-        ['ubuntu-default1', 'ubuntu-default2'])
+      selector = Natives::Catalog::Selector.new({
+        apt: {
+          ubuntu: {
+            ['12.10.1', '12.10', '12.10.2'] => 'value',
+            default: 'value-default'
+          }
+        }
+      })
+      expect(selector.values_for(:apt, :ubuntu, '99')).to eq(
+        ['value-default'])
     end
+
     it "returns default value when not matching platform" do
-      expect(selector.values_for(:apt, :foo, :'13')).to eq(
-        ['apt-default'])
+      selector = Natives::Catalog::Selector.new({
+        apt: {
+          ubuntu: {
+            ['12.10.1', '12.10', '12.10.2'] => 'ubuntu-value',
+            default: 'ubuntu-value-default'
+          },
+          default: 'value'
+        }
+      })
+      expect(selector.values_for(:apt, :foo, '12.10.1')).to eq(
+        ['value'])
+    end
+
+    it "returns default value when not matching platform version, and no version default value" do
+      selector = Natives::Catalog::Selector.new({
+        apt: {
+          ubuntu: {
+            ['12.10.1', '12.10', '12.10.2'] => 'ubuntu-value',
+          },
+          default: 'value'
+        }
+      })
+      expect(selector.values_for(:apt, :ubuntu, '99')).to eq(
+        ['value'])
     end
+
     it "returns empty list if there is no matching package provider" do
-      expect(selector.values_for(:notfound, :ubuntu, '10')).to eq([])
+      selector = Natives::Catalog::Selector.new({
+        apt: {
+          ubuntu: {
+            default: 'value'
+          }
+        }
+      })
+      expect(selector.values_for(:foo, :ubuntu, '99')).to eq([])
     end
-    it "returns nil if there is no default and no matching platform" do
-      expect(selector.values_for(:homebrew, :notfound, 1)).to eq([])
+
+    it "returns empty list if there is no default and no matching platform" do
+      selector = Natives::Catalog::Selector.new({
+        apt: {
+          ubuntu: {
+            '10.10' => 'value'
+          }
+        }
+      })
+      expect(selector.values_for(:apt, :foo, '10.10')).to eq([])
     end
-    it "returns nil if there is no default and no matching platform version" do
-      expect(selector.values_for(:homebrew, :mac_os_x, '999')).to eq([])
+    it "returns empty list if there is no default and no matching platform version" do
+      selector = Natives::Catalog::Selector.new({
+        apt: {
+          ubuntu: {
+            '10.10' => 'value'
+          }
+        }
+      })
+      expect(selector.values_for(:apt, :ubuntu, '99')).to eq([])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natives
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Huiming Teo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohai