natives 0.5.5 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDYxNjNkMGYyMGVhNDA2ZDI4Mjk0N2QzMTA3NjIxZWI5MDg2ODdiMA==
+    YzQxZTNmYjcyMGI5MGIxNjUzYWZiYjExYmE1MWUxMDQ3YjU2NWExNw==
   data.tar.gz: !binary |-
-    NTk0YTNhMTIyZjEzNzlmZjU1ZTU1NzZkNDcwMzYzOTgwNmNkYzAwNQ==
+    ZjI4MTc0NzY1OTdjMGUyM2Q5MzJiOGU4NmRiNjEzMzc0YWZiZDViNQ==
 SHA512:
   metadata.gz: !binary |-
-    NGFhNzdhMDg4OWU2MDJjMTJlMGUyNTQyNTU1YWVjZDFjOTAwNTM0MzZiMDNj
-    ZWM4MDNlOTkwODljNTAxYmY3MDBmMTY5ZDY4YmRlZTFlZTQ0ZWM3NTBhNmU1
-    YTEyMTcyOGY5ZDg2NDU2NGM0NjE5MDJlM2EyN2M3ZDI1NjVlZDQ=
+    NmM1NGVmZGM0YWUzZThmMDc4NGQ3Njc2YTFiZjAyOTJmOGEzYzIwYzExNDY2
+    ZmM2Nzg2MjY0ODQzYjY4NjE1YzA2OGVjNDEyN2JmYTgzYWQ4ZDYxMjdkYjdh
+    NzcwOWVkMTM4MTI1MWZkYTMwMzkyY2Q2OGJhZmNlYjdhMmU1ZDE=
   data.tar.gz: !binary |-
-    MDBhMmE4MDNlYmJiMzkxODZlY2RhNjlmZDg5ZTA2YTY3NTgzMzFmY2JiZDZh
-    YTIyMzhkNGE4M2JmYTdjNGQ3ODNiMGZiYTA4ZTY0MzMzYzhiYWVjNTk2YTZi
-    NTQ2YTU3YmJhZTJhMjFmMDU4YzcxOTk4YzQ5MTE2N2JjZjk2ZDM=
+    ZjkzOThmY2M0OGU5NzI1NWMwMzQ2ZTMxNjllMDQwNjUwZGE4MWY4NTIwYWYx
+    OGFiYzVlMGIyOWRiNGU1YWY1NTVlZDY3NDM3MjI2ODM1NzY0MDkxNmI3ZmZj
+    MDcxODVlNmI2MWQ2M2YxNWFlMjhmNWI1M2M3ZGY4NDhhMzAxZTE=

data/Gemfile

@@ -10,7 +10,6 @@ group :development do
   gem "rspec"
   gem "yard"
   gem "rdoc"
-  gem "bundler"
   gem "jeweler"
   gem "debugger"
   gem "simplecov"

data/README.md

@@ -3,6 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/natives.png)](http://badge.fury.io/rb/natives)
 [![Code Climate](https://codeclimate.com/github/teohm/natives.png)](https://codeclimate.com/github/teohm/natives)
 [![Build Status](https://travis-ci.org/teohm/natives.png)](https://travis-ci.org/teohm/natives)
+[![Dependency Status](https://gemnasium.com/teohm/natives.png)](https://gemnasium.com/teohm/natives)
 
 List native packages required by ruby gems on your machine.
 
@@ -59,10 +60,12 @@ $ cd rails_app1
 $ cat natives-catalogs/catalog1.yaml
 rubygems:
   my_gem:
-    mac_os_x/homebrew:
-      - package1
-    ubuntu/apt:
-      - package2
+    homebrew:
+      mac_os_x:
+        - package1
+    apt:
+      default:
+        - package2
 
 $ natives list my_gem   # runs on mac os x
 package1
@@ -84,16 +87,17 @@ It loads YAML files (.yaml, .yml) from the following paths in this order:
 
 When there are multiple YAML files in a path, they are **sorted by filename** and loaded in that order.
 
-### Catalog file format
+### Catalog YAML format
 
 A catalog file is written in YAML, based on this format:
 
 ```
 catalog_name:
   entry_name:
-    platform/package_provider:
-      version:
-        - package_name
+    package_provider:
+      platform:
+        platform_version:
+          - package_name
 ```
 
 For example,
@@ -101,9 +105,10 @@ For example,
 ```
 rubygems:
   capybara-webkit:
-    mac_os_x/homebrew:
-      10.7.5:
-        - libqtwebkit-dev
+    homebrew:
+      mac_os_x:
+        10.7.5:
+          - libqtwebkit-dev
 ```
 
 #### Use `default` when apply to all platforms
@@ -111,79 +116,87 @@ rubygems:
 ```
 rubygems:
   curb:
-    default:
-      - curl
-```
-
-#### Use `default` when apply to all versions
-
-```
-rubygems:
-  capybara-webkit:
-    mac_os_x/homebrew:
+    apt:
       default:
-        - libqtwebkit-dev
+        - libcurl4-openssl-dev
+
 ```
 
-#### Use array to group platforms
+#### Use `default` when apply to all platform versions
 
 ```
 rubygems:
   capybara-webkit:
-    [ubuntu/apt, debian/apt]:
-      default:
-        - libqtwebkit-dev
+    homebrew:
+      mac_os_x:
+        default:
+          - libqtwebkit-dev
 ```
 
-#### Use array to group versions
-
-
+#### Use array to group platform versions
 
 ```
 rubygems:
   capybara-webkit:
-    ubuntu/apt:
-      [10.04, 10.04.1, 10.04.2, 10.04.3, 10.04.4]:
-        - libqt4-dev
-      default:
-        - libqtwebkit-dev
+    apt:
+      ubuntu:
+        [10.04, 10.04.1, 10.04.2, 10.04.3, 10.04.4]:
+          - libqt4-dev
+        default:
+          - libqtwebkit-dev
 ```
 
 
-#### Supported values for platform/package_provider
+#### Supported values for platforms and package providers
 
 Not in the list? No worry, submit a PR to patch [`host_detection/package_provider.rb`](https://github.com/teohm/natives/blob/master/lib/natives/host_detection/package_provider.rb).
 
-```
-aix/aix
-amazon/yum
-arch/pacman
-centos/yum
-debian/apt
-fedora/yum
-freebsd/freebsd
-gcel/apt
-gentoo/portage
-linaro/apt
-linuxmint/apt
-mac_os_x/homebrew
-mac_os_x/macports
-mac_os_x_server/macports
-nexentacore/solaris
-omnios/ips
-openindiana/ips
-opensolaris/ips
-opensuse/zypper
-oracle/yum
-raspbian/apt
-redhat/yum
-scientific/yum
-smartos/smartos
-solaris2/ips
-suse/zypper
-ubuntu/apt
-xcp/yum
-xenserver/yum
+##### Package providers
+```
+aix
+yum
+packman
+apt
+feebsd
+portage
+homebrew
+macports
+solaris
+ips
+zypper
+smartos
+```
+
+##### Platforms
+```
+aix
+amazon
+arch
+centos
+debian
+fedora
+freebsd
+gcel
+gentoo
+linaro
+linuxmint
+mac_os_x
+mac_os_x_server
+nexentacore
+omnios
+openindiana
+opensolaris
+opensuse
+oracle
+raspbian
+redhat
+scientific
+smartos
+solaris2
+suse
+ubuntu
+xcp
+xenserver
 ```
 
 

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.6.0

data/Vagrantfile

@@ -18,10 +18,10 @@ Vagrant::Config.run do |config|
   # Provision docker and new kernel if deployment was not done.
   # It is assumed Vagrant can successfully launch the provider instance.
   if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty?
-    # Add lxc-docker package
+    # Add lxc-docker and parallel package
     pkg_cmd = "wget -q -O - https://get.docker.io/gpg | apt-key add -;" \
       "echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list;" \
-      "apt-get update -qq; apt-get install -q -y --force-yes lxc-docker; "
+      "apt-get update -qq; apt-get install -q -y --force-yes lxc-docker parallel; "
     # Add Ubuntu raring backported kernel
     pkg_cmd << "apt-get update -qq; apt-get install -q -y linux-image-generic-lts-raring; "
     # Add guest additions if local vbox VM. As virtualbox is the default provider,

data/catalogs/rubygems.yaml

@@ -1,74 +1,55 @@
 rubygems:
   capybara-webkit:
-    mac_os_x/macports:
-      default:
-        - qt4-mac-devel
-    mac_os_x/homebrew:
-      default:
-        - qt
-    debian/apt:
-      default:
-        - libqtwebkit-dev
-    ubuntu/apt:
+    macports:
+      mac_os_x:
+        default:
+          - qt4-mac-devel
+    homebrew:
+      mac_os_x:
+        default:
+          - qt
+    apt:
       default:
         - libqtwebkit-dev
   curb:
-    debian/apt:
-      default:
-        - libcurl4-openssl-dev
-    ubuntu/apt:
+    apt:
       default:
         - libcurl4-openssl-dev
   nokogiri:
-    debian/apt:
-      default:
-        - libxslt-dev
-        - libxml2-dev
-    ubuntu/apt:
+    apt:
       default:
         - libxslt-dev
         - libxml2-dev
   pg:
-    mac_os_x/homebrew:
-      default:
-        - postgres
-    debian/apt:
-      default:
-        - libpq-dev
-    ubuntu/apt:
+    homebrew:
+      mac_os_x:
+        default:
+          - postgres
+    apt:
       default:
         - libpq-dev
   rmagick:
-    mac_os_x/homebrew:
-      default:
-        - imagemagick
-    debian/apt:
-      default:
-        - imagemagick
-        - libmagickwand-dev
-    ubuntu/apt:
+    homebrew:
+      mac_os_x:
+        default:
+          - imagemagick
+    apt:
       default:
         - imagemagick
         - libmagickwand-dev
   tesseract-ocr:
-    mac_os_x/homebrew:
-      default:
-        - tesseract
-    debian/apt:
-      default:
-        - libtesseract-dev
-        - libleptonica-dev
-    ubuntu/apt:
+    homebrew:
+      mac_os_x:
+        default:
+          - tesseract
+    apt:
       default:
         - libtesseract-dev
         - libleptonica-dev
   sqlite3:
-    debian/apt:
-      default:
-        - libsqlite3-dev
-    ubuntu/apt:
+    apt:
       default:
         - libsqlite3-dev
-    fedora/yum:
+    yum:
       default:
         - sqlite-devel

data/catalogs_test/bin/test_catalog

@@ -16,9 +16,11 @@ done
 
 gems="$( $BIN_HOME/list_all )"
 
-for image_name in $image_names; do
-  for gem in $gems; do
-    $BIN_HOME/test_entry $image_name $gem
-  done
-done
+#for image_name in $image_names; do
+  #for gem in $gems; do
+    #$BIN_HOME/test_entry $image_name $gem
+  #done
+#done
 
+# Experimental: run test in parallel
+parallel --gnu -j+0 $BIN_HOME/test_entry ::: $image_names ::: $gems

data/lib/natives/catalog.rb

@@ -38,7 +38,7 @@ module Natives
     def native_packages_for(*entry_names)
       packages = Array(entry_names).flatten.map do |entry_name|
         Selector.new(self.to_hash.fetch(entry_name, {})).
-          value_for(@platform, @platform_version, @package_provider)
+          values_for(@package_provider, @platform, @platform_version)
       end
       packages.flatten.compact
     end

data/lib/natives/catalog/normalizer.rb

@@ -0,0 +1,77 @@
+require 'natives/errors'
+
+module Natives
+  class Catalog
+    class Normalizer
+
+      def normalize(hash)
+        normalize_package_provider_hash(hash)
+      end
+
+      protected
+
+      def default?(str)
+        'default' == str
+      end
+
+      def convert_to_hash(hash)
+        return hash.to_h    if hash.respond_to?(:to_h)
+        return hash.to_hash if hash.respond_to?(:to_hash)
+        if block_given?
+          yield
+        else
+          raise InvalidCatalogFormat
+        end
+      end
+
+      def normalize_package_provider_hash(hash)
+        hash = convert_to_hash(hash) do
+          raise InvalidCatalogFormat,
+            "expected a hash of package providers, but got: #{hash.inspect}"
+        end
+
+        hash.inject({}) do |normalized_hash, (k, v)|
+          normalized_hash[k.to_s] = normalize_platform_hash(v)
+          normalized_hash
+        end
+      end
+
+      def normalize_platform_hash(hash)
+        hash = convert_to_hash(hash) do
+          raise InvalidCatalogFormat,
+            "expected a hash of platforms, but got: #{hash.inspect}"
+        end
+
+        hash.inject({}) do |normalized_hash, (k, v)|
+          platform = k.to_s
+          value = if default?(platform)
+                    normalize_native_package_list(v)
+                  else
+                    normalize_version_hash(v)
+                  end
+          normalized_hash[platform] = value
+          normalized_hash
+        end
+      end
+
+      def normalize_version_hash(hash)
+        hash = convert_to_hash(hash) do
+          raise InvalidCatalogFormat,
+            "expected a hash of versions, but got: #{hash.inspect}"
+        end
+
+        hash.inject({}) do |normalized_hash, (k, v)|
+          versions = Array(k)
+          versions.each do |version|
+            normalized_hash[version.to_s] = normalize_native_package_list(v)
+          end
+          normalized_hash
+        end
+      end
+
+      def normalize_native_package_list(list)
+        Array(list)
+      end
+    end
+  end
+end

data/lib/natives/catalog/selector.rb

@@ -1,77 +1,36 @@
+require 'natives/catalog/normalizer'
+
 module Natives
   class Catalog
     class Selector
-      def initialize(platform_hash)
-        assert_valid_platform_hash(platform_hash)
-        @values = normalize_platform_hash(platform_hash)
+      def initialize(hash)
+        @values = normalize(hash)
       end
 
-      def value_for(platform, platform_version, package_provider)
-        key = "#{platform.to_s}/#{package_provider.to_s}"
-        if @values.key?(key) && @values[key].key?(platform_version)
-          @values[key][platform_version]
-        elsif @values.key?(key) && @values[key].key?('default')
-          @values[key]['default']
-        elsif @values.key?('default')
-          @values['default']
-        else
-          nil
-        end
-      end
-
-      protected
-
-      def normalize_platform_hash(platform_hash)
-        normalized_hash = {}
-        platform_hash.each do |keys, value|
-          if keys.to_s == 'default'
-            normalized_hash['default'] = value
+      def values_for(package_provider, platform, platform_version)
+        package_provider = package_provider.to_s
+        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
-            Array(keys).each do |key|
-              normalized_hash[key.to_s] = normalize_keys(value)
-            end
+            values = platforms.fetch('default', nil)
           end
         end
-        normalized_hash
-      end
 
-      def normalize_keys(hash)
-        normalized_hash = {}
-        hash.each do |keys, value|
-          Array(keys).each do |key|
-            normalized_hash[key.to_s] = value
-          end
-        end
-        normalized_hash
+        Array(values)
       end
 
-      def assert_valid_platform_hash(platform_hash)
-        unless platform_hash.kind_of? Hash
-          raise ArgumentError, 'catalog entry should be a hash'
-        end
+      private
 
-        platform_hash.each do |platforms, value|
-          assert_valid_key_and_value(platforms, value)
-        end
-      end
-
-      def assert_valid_key_and_value(platforms, value)
-        return if platforms.to_s == 'default'
-
-        keys = platforms.kind_of?(Array) ? platforms : [platforms]
-        keys.each do |key|
-          if (%r{\A.+/.+\Z} =~ key.to_s) == nil && key.to_s != 'default'
-            msg = "Found an invalid key: #{key.inspect}. "
-            msg << "A valid key should be in this format: 'platform/package_provider'."
-            raise ArgumentError, msg
-          end
-        end
-
-        unless value.kind_of? Hash
-          msg = "Found an invalid value: #{value.inspect} "
-          msg << "for key: #{platforms.inspect}. The value should be a Hash."
-          raise ArgumentError, msg
-        end
+      def normalize(hash)
+        Normalizer.new.normalize(hash)
       end
 
     end

data/lib/natives/errors.rb

@@ -0,0 +1,5 @@
+module Natives
+  class NativesError < StandardError; end
+
+  class InvalidCatalogFormat < NativesError; end
+end

data/lib/natives/gemfile_viewer.rb

@@ -3,8 +3,8 @@ require 'bundler'
 module Natives
   class GemfileViewer
     def initialize(gemfile_path)
-      @gemfile_path = gemfile_path
-      @lockfile_path = "#{gemfile_path}.lock"
+      @gemfile_path = File.expand_path(gemfile_path)
+      @lockfile_path = "#{@gemfile_path}.lock"
     end
 
     def gem_names

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.5.5 ruby lib
+# stub: natives 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "natives"
-  s.version = "0.5.5"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Huiming Teo"]
-  s.date = "2013-11-13"
+  s.date = "2013-11-18"
   s.description = "Lookup native package dependencies required by gems on your machine."
   s.email = "teohuiming@gmail.com"
   s.executables = ["natives"]
@@ -52,9 +52,11 @@ Gem::Specification.new do |s|
     "lib/natives/catalog.rb",
     "lib/natives/catalog/loader.rb",
     "lib/natives/catalog/merger.rb",
+    "lib/natives/catalog/normalizer.rb",
     "lib/natives/catalog/selector.rb",
     "lib/natives/catalog/validator.rb",
     "lib/natives/cli.rb",
+    "lib/natives/errors.rb",
     "lib/natives/gemfile_viewer.rb",
     "lib/natives/host_detection.rb",
     "lib/natives/host_detection/package_provider.rb",
@@ -74,6 +76,7 @@ Gem::Specification.new do |s|
     "spec/natives/apps/list_spec.rb",
     "spec/natives/catalog/loader_spec.rb",
     "spec/natives/catalog/merger_spec.rb",
+    "spec/natives/catalog/normalizer_spec.rb",
     "spec/natives/catalog/selector_spec.rb",
     "spec/natives/catalog/validator_spec.rb",
     "spec/natives/catalog_spec.rb",
@@ -86,7 +89,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/teohm/natives"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.10"
+  s.rubygems_version = "2.1.11"
   s.summary = "Lookup native packages required by gems."
 
   if s.respond_to? :specification_version then
@@ -99,7 +102,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<debugger>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
@@ -110,7 +112,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
@@ -122,7 +123,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])

data/spec/fixtures/dir_with_matching_files/invalid1.yml

@@ -1,9 +1,10 @@
 rubygems:
   invalid_line
-    ubuntu/apt:
-      default:
-        - imagemagick
-        - libmagick9-dev
+    apt:
+      ubuntu:
+        default:
+          - imagemagick
+          - libmagick9-dev
   curb:
     default:
       - curl

data/spec/fixtures/dir_with_matching_files/valid1.yaml

@@ -1,21 +1,26 @@
 rubygems:
   capybara-webkit:
-    mac_os_x/macports:
-      default:
-        - qt4-mac-devel
-    mac_os_x/homebrew:
-      default:
-        - qt
-    ubuntu/apt:
-      default:
-        - libqtwebkit-dev
-      [10.04,10.04.1,10.04.2,10.04.3,10.04.4]:
-        - libqt4-dev
+    macports:
+      mac_os_x:
+        default:
+          - qt4-mac-devel
+    homebrew:
+      mac_os_x:
+        default:
+          - qt
+    apt:
+      ubuntu:
+        default:
+          - libqtwebkit-dev
+        [10.04,10.04.1,10.04.2,10.04.3,10.04.4]:
+          - libqt4-dev
   rmagick:
-    mac_os_x/homebrew:
-      default:
-        - imagemagick
-    ubuntu/apt:
-      default:
-        - imagemagick
-        - libmagick9-dev
+    homebrew:
+      mac_os_x:
+        default:
+          - imagemagick
+    apt:
+      ubuntu:
+        default:
+          - imagemagick
+          - libmagick9-dev

data/spec/natives/catalog/normalizer_spec.rb

@@ -0,0 +1,128 @@
+require 'spec_helper'
+require 'natives/catalog/normalizer'
+
+describe "Catalog Normalizer" do
+  let(:normalizer) { Natives::Catalog::Normalizer.new }
+
+  context "Given valid hash input" do
+    it "converts package provider, platform, platform version to string" do
+      hash = normalizer.normalize({
+        :macports => {
+          :mac_os_x => {
+            :default => ['foo'],
+            :"10.1.2" => ['bar']
+          }
+        }
+      })
+
+      expect(hash).to eq({
+        'macports' => {
+          'mac_os_x' => {
+            'default' => ['foo'],
+            '10.1.2' => ['bar']
+          }
+        }
+      })
+    end
+
+    it "supports default platform" do
+      hash = normalizer.normalize({
+        apt: {
+          default: ['foo'],
+          ubuntu: {
+            default: ['bar']
+          }
+        }
+      })
+
+      expect(hash).to eq({
+        'apt' => {
+          'default' => ['foo'],
+          'ubuntu' => {
+            'default' => ['bar']
+          }
+        }
+      })
+    end
+
+    it "normalizes version list" do
+      hash = normalizer.normalize({
+        apt: {
+          ubuntu: {
+            :default => ['bar'],
+            '13' => ['top'],
+            ['11','12','13'] => ['foo'],
+            '11' => ['bottom']
+          }
+        }
+      })
+
+      expect(hash).to eq({
+        'apt' => {
+          'ubuntu' => {
+            'default' => ['bar'],
+            '13' => ['foo'],
+            '11' => ['bottom'],
+            '12' => ['foo']
+          }
+        }
+      })
+    end
+
+    it "ensures native packages is a list" do
+      hash = normalizer.normalize({
+        apt: {
+          default: 'defaultfoo',
+          ubuntu: {
+            :default => 'bar',
+            '14' => 'top',
+            ['11','12','13'] => 'foo',
+          }
+        }
+      })
+
+      expect(hash).to eq({
+        'apt' => {
+          'default' => ['defaultfoo'],
+          'ubuntu' => {
+            'default' => ['bar'],
+            '14' => ['top'],
+            '11' => ['foo'],
+            '12' => ['foo'],
+            '13' => ['foo']
+          }
+        }
+      })
+    end
+
+  end
+
+  context "Invalid input" do
+
+    it "raises error when package provider hash is not a hash" do
+      expect {
+        normalizer.normalize("invalid")
+      }.to raise_error Natives::InvalidCatalogFormat
+
+    end
+
+    it "raises error when platform hash is not a hash" do
+      expect {
+        normalizer.normalize({
+          "macports" => "invalid"
+        })
+      }.to raise_error Natives::InvalidCatalogFormat
+    end
+
+    it "raises error when version hash is not a hash" do
+      expect {
+        normalizer.normalize({
+          "macports" => {
+            "ubuntu" => nil
+          }
+        })
+      }.to raise_error Natives::InvalidCatalogFormat
+    end
+
+  end
+end

data/spec/natives/catalog/selector_spec.rb

@@ -2,123 +2,50 @@ require 'spec_helper'
 require 'natives/catalog/selector'
 
 describe Natives::Catalog::Selector do
-  describe "#new" do
 
-    describe "assert valid platform hash" do
-      it "raises error if platform hash is not a hash" do
-        expect {
-          Natives::Catalog::Selector.new(nil)
-        }.to raise_error(ArgumentError, "catalog entry should be a hash")
-      end
-
-      it "raises error when found an invalid string as hash key" do
-        expect {
-          Natives::Catalog::Selector.new({
-            "mac_os_x/homebrew" => {"default" => "value"},
-            "ubuntu" => {"default" => "value"},
-            "debian" => {"default" => "value"}
-          })
-        }.to raise_error ArgumentError, /Found an invalid key: "ubuntu"/
-      end
-
-      it "raises error when found an invalid array as hash key" do
-        expect {
-          Natives::Catalog::Selector.new({
-            ["fedora/yum", "redhat/yum"] => {"default" => "value"},
-            ["centos/yum", "oracle"] => {"default" => "value"},
-          })
-        }.to raise_error ArgumentError, /Found an invalid key: "oracle"/
-      end
-
-      it "raises error if platform hash's value is not a hash" do
-        expect {
-          Natives::Catalog::Selector.new({
-            "ubuntu/apt" => "value",
-            "mac_os_x/homebrew" => {"default" => "value"},
-          })
-        }.to raise_error ArgumentError, /Found an invalid value: "value"/
-      end
-
-      it "accepts default platform value" do
-        expect {
-          Natives::Catalog::Selector.new({
-            "default" => "value"
-          })
-        }.not_to raise_error
-      end
-    end
-
-    describe "normalize platform hash" do
-      class ProxySelector < Natives::Catalog::Selector
-        def normalized_values
-          @values
-        end
-      end
-
-      it "expand platform array" do
-        expect(ProxySelector.new({
-          "mac_os_x/homebrew" => {"default" => "value1"},
-          ["ubuntu/apt", "debian/apt"] => {"default" => "value2"}
-        }).normalized_values).to eq({
-          "mac_os_x/homebrew" => {"default" => "value1"},
-          "ubuntu/apt" => {"default" => "value2"},
-          "debian/apt" => {"default" => "value2"}
-        })
-      end
-
-      it "expand version array" do
-        expect(ProxySelector.new({
-          "mac_os_x/homebrew" => {
-            "default" => "value1",
-            ["v1", "v2"] => "value2"
+  describe "#value_for" do
+    let(:selector) do
+      Natives::Catalog::Selector.new({
+        apt: {
+          default: 'apt-default',
+          ubuntu: {
+            '12.10' => 'ubuntu-12.10',
+            %w(10.10 10.10.1 10.10.2) => %w(ubuntu-10.10s),
+            'default' => %w(ubuntu-default1 ubuntu-default2)
           }
-        }).normalized_values).to eq({
-          "mac_os_x/homebrew" => {
-            "default" => "value1",
-            "v1" => "value2",
-            "v2" => "value2"
+        },
+        homebrew: {
+          mac_os_x: {
+            '10' => 'foo'
           }
-        })
-      end
+        }
+      })
     end
-  end
 
-  describe "#value_for" do
-    it "returns the default value when the platform/package_provider doesn't match" do
-      expect(
-        Natives::Catalog::Selector.new({
-          "ubuntu/apt" => {"default" => "libcurl"},
-          "default" => "curl"
-        }).value_for('mac_os_x', '10.7.5', 'homebrew')
-      ).to eq('curl')
+    it "returns values for a specific platform version" do
+      expect(selector.values_for(:apt, :ubuntu, :'12.10')).to eq(
+        ['ubuntu-12.10'])
     end
-
-    it "returns a value for a specific platform version" do
-      expect(
-        Natives::Catalog::Selector.new({
-          ["mac_os_x/homebrew", "mac_os_x/macports"] => {
-            "10.7.5" => "curl", "default" => "foo"},
-          "default" => "bar"
-        }).value_for('mac_os_x', '10.7.5', 'homebrew')
-      ).to eq('curl')
+    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'])
     end
-
-    it "returns a platform-default value if the platform version doesn't match an explicit one" do
-      expect(
-        Natives::Catalog::Selector.new({
-          "mac_os_x/homebrew" => {
-            "10.7.5" => "curl", "default" => "foo"},
-          "default" => "bar"
-        }).value_for('mac_os_x', '10.8.0', 'homebrew')
-      ).to eq('foo')
+    it "returns default version values when no matching platform version" do
+      expect(selector.values_for('apt', 'ubuntu', '13')).to eq(
+        ['ubuntu-default1', 'ubuntu-default2'])
     end
-
-    it "returns nil if there is no default and no platforms match" do
-      expect(
-        Natives::Catalog::Selector.new({
-          ["mac_os_x/homebrew", "mac_os_x/macports"] => {"10.7.5" => "curl"}
-        }).value_for('mac_os_x', '10.8.0', 'homebrew')
-      ).to be_nil
+    it "returns default value when not matching platform" do
+      expect(selector.values_for(:apt, :foo, :'13')).to eq(
+        ['apt-default'])
+    end
+    it "returns empty list if there is no matching package provider" do
+      expect(selector.values_for(:notfound, :ubuntu, '10')).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([])
+    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([])
     end
   end
 end

data/spec/natives/catalog_spec.rb

@@ -93,14 +93,18 @@ describe Natives::Catalog do
         and_return({
           'rubygems' => {
             'nokogiri' => {
-              'ubuntu/apt' => {
-                '13.10' => 'value1',
-                'default' => 'value2'
+              'apt' => {
+                'ubuntu' => {
+                  '13.10' => 'value1',
+                  'default' => 'value2'
+                }
               }
             },
             'curb' => {
-              'ubuntu/apt' => {
-                'default' => 'value3'
+              'apt' => {
+                'ubuntu' => {
+                  'default' => 'value3'
+                }
               }
             }
           },

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natives
 version: !ruby/object:Gem::Version
-  version: !binary |-
-    MC41LjU=
+  version: 0.6.0
 platform: ruby
 authors:
 - Huiming Teo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohai
@@ -95,20 +94,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -193,9 +178,11 @@ files:
 - lib/natives/catalog.rb
 - lib/natives/catalog/loader.rb
 - lib/natives/catalog/merger.rb
+- lib/natives/catalog/normalizer.rb
 - lib/natives/catalog/selector.rb
 - lib/natives/catalog/validator.rb
 - lib/natives/cli.rb
+- lib/natives/errors.rb
 - lib/natives/gemfile_viewer.rb
 - lib/natives/host_detection.rb
 - lib/natives/host_detection/package_provider.rb
@@ -215,6 +202,7 @@ files:
 - spec/natives/apps/list_spec.rb
 - spec/natives/catalog/loader_spec.rb
 - spec/natives/catalog/merger_spec.rb
+- spec/natives/catalog/normalizer_spec.rb
 - spec/natives/catalog/selector_spec.rb
 - spec/natives/catalog/validator_spec.rb
 - spec/natives/catalog_spec.rb
@@ -243,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Lookup native packages required by gems.