natives-catalog 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzM0MTQxY2QwN2VhZTZkODA3NmE3ZTU4ZTg0NjY2NjY3MWY4OGI0Mg==
+    N2ZkYTA1YWNkOTNkMjdhMWFmM2VmNmFmODc2ODk3MzJiN2Y5MGJkYg==
   data.tar.gz: !binary |-
-    M2JiZjQ0MDJkOGQyMDgzNzQ3OTAzMDdmYjIwZmRiOGNmYTFlNmM1YQ==
+    NTljZDE2ZTkzYjg2YWUyNzYyZGFiOGNjYzZkZDQ0ZDlhMDg4YzU4Nw==
 SHA512:
   metadata.gz: !binary |-
-    OWIwYjA0MDQ5N2ZiMmQxMTU4ZmE2OTFiNzkyYzI0NWFmZmZjYTQ5MTM2YzEy
-    OThlNzVjMTg5NmU3MDQxYTQ0ZjRiMzJkYWMzMTBlMjk3ZjhkZWM4MDZkNTdh
-    NjUxZTIyYmE5MWI3OWFhYjRlNDQ2NTc0MGY2NjM1OGMwYzlkMTQ=
+    ZmRiYjVhNDYxNTZiNTZkNWI2Y2Y0NmVhMzFhMDdiMjcxZjc2NmFmZmNjMTZh
+    OTk2YzY0MjY4MDlkMTg5MzQ0NTU1OTE1MzBiMDI1ZDgyOGFlN2VlNDdkOGUy
+    NzVhZGFlOTM4YzY2N2FkYzU3Y2Q1YzViMjdhMzViODE4ODY3ODQ=
   data.tar.gz: !binary |-
-    ZTRjZDU5Yjk4MDJkMTkzODUzZDE2ZThmM2ZmMmE4MDU5ZDJlYzFhZTQ1OWMw
-    NDVkZGRjNzkwYjE4ZTVjNWUxNTYxY2M2Y2RiMDliZjA4ZGY5MDg2ZTk1ZWQ5
-    MTc4ZDQxODFhYTMzYjdjZDNmYWJkNjUwZTY0OTA1N2QxNWE0NWE=
+    ZThlYjM1ODEzMTZlMmNkYmQyNTAwMTJlNTc3NTQyYjM2OGM1M2JiMmQ3NGIz
+    YWY1ZjI5MWZmY2JiNjNkYmE4NTQ5ZTFiNDUyYmM5NGU2NGYyOTFjMGJmNmI1
+    YzlkNzU3YWRkYzJkOGUzZmQxZDYwZTZkNmE3M2NlMzA4MDk4MGM=

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/natives/catalog.rb

@@ -6,26 +6,29 @@ module Natives
 
     CATALOG_PATH_IN_GEM = File.absolute_path(File.join(
                             File.dirname(__FILE__), '..', '..', 'catalogs'))
-    CATALOG_PATH_IN_WORKING_DIR = File.absolute_path(File.join('.', 'natives-catalogs'))
 
-    CATALOG_PATHS = [
-      CATALOG_PATH_IN_GEM,
-      CATALOG_PATH_IN_WORKING_DIR
-    ].freeze
+    WORKING_DIR_CATALOG_DIRNAME = 'natives-catalogs'
 
     attr_reader :platform, :platform_version, :package_provider, :name
 
-    def initialize(catalog_name, platform, platform_version, package_provider)
-      reload
+    def initialize(catalog_name,
+                   platform, platform_version,
+                   package_provider,
+                   opts={})
 
       @name = catalog_name.to_s
       @platform = platform.to_s
       @platform_version = platform_version.to_s
       @package_provider = package_provider.to_s
+
+      @loader = opts.fetch(:loader, Loader.new)
+      @working_dir = opts.fetch(:working_dir, Dir.pwd)
+
+      reload
     end
 
     def reload
-      @catalogs = Loader.new.load_from_paths(CATALOG_PATHS)
+      @catalogs = @loader.load_from_paths(catalog_paths)
     end
 
     def to_hash
@@ -40,5 +43,14 @@ module Natives
       packages.flatten.compact
     end
 
+    protected
+
+    def catalog_paths
+      [
+        CATALOG_PATH_IN_GEM,
+        File.absolute_path(File.join(@working_dir, WORKING_DIR_CATALOG_DIRNAME))
+      ]
+    end
+
   end
 end

data/natives-catalog.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-catalog 0.3.0 ruby lib
+# stub: natives-catalog 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "natives-catalog"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Huiming Teo"]
-  s.date = "2013-10-27"
+  s.date = "2013-11-04"
   s.description = "A catalog of native packages in different platforms required by ruby gems."
   s.email = "teohuiming@gmail.com"
   s.extra_rdoc_files = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/teohm/natives-catalog"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.9"
+  s.rubygems_version = "2.1.10"
   s.summary = "A catalog of native packages for ruby gems."
 
   if s.respond_to? :specification_version then

data/spec/natives/catalog_spec.rb

@@ -10,7 +10,10 @@ describe Natives::Catalog do
     end
 
     it "requires caller to provide platform and package provider details" do
-      catalog = Natives::Catalog.new('rubygems', 'mac_os_x', '10.7.5', 'homebrew')
+      catalog = Natives::Catalog.new('rubygems',
+                                     'mac_os_x', '10.7.5',
+                                     'homebrew')
+
       expect(catalog.name).to eq('rubygems')
       expect(catalog.platform).to eq('mac_os_x')
       expect(catalog.platform_version).to eq('10.7.5')
@@ -20,18 +23,45 @@ describe Natives::Catalog do
 
   describe "#reload" do
     it "reloads catalogs from default catalog paths" do
-      Natives::Catalog::Loader.any_instance.
+      loader = double()
+      loader.
+        should_receive(:load_from_paths).
+        with([
+          Natives::Catalog::CATALOG_PATH_IN_GEM,
+          File.absolute_path(File.join(Dir.pwd, 'natives-catalogs'))
+        ]).
+        and_return({
+          'rubygems' => {'foo' => {'key' => 'value'}},
+          'npm' => {'bar' => {'key' => 'value'}}
+        })
+
+      catalog = Natives::Catalog.new('rubygems',
+                                     'mac_os_x', '10.7.5', 'homebrew',
+                                     loader: loader)
+
+      expect(catalog.to_hash).to eq({'foo' => {'key' => 'value'}})
+    end
+
+    it "reloads catalogs from given working directory" do
+      loader = double()
+      loader.
         should_receive(:load_from_paths).
-        with(Natives::Catalog::CATALOG_PATHS).
+        with([
+          Natives::Catalog::CATALOG_PATH_IN_GEM,
+          '/path/to/working_dir/natives-catalogs'
+        ]).
         and_return({
           'rubygems' => {'foo' => {'key' => 'value'}},
           'npm' => {'bar' => {'key' => 'value'}}
         })
 
       catalog = Natives::Catalog.new('rubygems',
-                                     'mac_os_x', '10.7.5', 'homebrew')
+                                     'mac_os_x', '10.7.5', 'homebrew',
+                                     loader: loader,
+                                     working_dir: '/path/to/working_dir')
 
       expect(catalog.to_hash).to eq({'foo' => {'key' => 'value'}})
+
     end
   end
 
@@ -39,7 +69,6 @@ describe Natives::Catalog do
     before do
       Natives::Catalog::Loader.any_instance.
         stub(:load_from_paths).
-        with(Natives::Catalog::CATALOG_PATHS).
         and_return({
           'rubygems' => {'foo' => {'key' => 'value'}},
           'npm' => {'bar' => {'key' => 'value'}}
@@ -61,7 +90,6 @@ describe Natives::Catalog do
     before do
       Natives::Catalog::Loader.any_instance.
         stub(:load_from_paths).
-        with(Natives::Catalog::CATALOG_PATHS).
         and_return({
           'rubygems' => {
             'nokogiri' => {
@@ -102,13 +130,4 @@ describe Natives::Catalog do
     end
   end
 
-  describe "::CATALOG_PATHS" do
-    it "contains the default catalog paths" do
-      expect(Natives::Catalog::CATALOG_PATHS).to eq([
-        Natives::Catalog::CATALOG_PATH_IN_GEM,
-        Natives::Catalog::CATALOG_PATH_IN_WORKING_DIR
-      ])
-    end
-  end
-
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: natives-catalog
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: !binary |-
+    MC4zLjE=
 platform: ruby
 authors:
 - Huiming Teo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: A catalog of native packages for ruby gems.