natives 0.1.3 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDI3ZTlkZGExYjdmZDNkZTMyZWFjMzA2NGE4Y2UyZmQyNmIyODEwZQ==
+    MTUzYTlmMWQzYTI2YjI4ZjcyZjdjOTc2MzI4MTczMjM4OTk0OWVjMQ==
   data.tar.gz: !binary |-
-    MDNkZDgzYjFmYjhiMjY5NGJmNmI1NmEzZWVhNzgwZmM2ZmYxYjhhYg==
+    MzA4ZGI3ZGJiOTdjZWEzNDg3MDJmOTNhNjU1ZTQ3NzAwMDRiYTQ1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NjJkNDRmOWM0N2RjNDViMTllOGFkODM0MTQ2OGY4ZWVkODk1MTNiZTI0MzY3
-    NzZmNzdiOWVhZTIxMzM3ZjEwY2I0ODllZDU2MDk5MWUyMmJmMTdlYzNkMzJj
-    NjU0MGMyNDI0ZDQxYWEwZDA4NGU4ZjkxYTFmMmVmZDdlMThjMzA=
+    N2ZmY2E3OGFiZTRkMmRlMjA1YTI5OGQ2YWQwZTc4YmIyOTgyYjk1NzNiMGNk
+    YmU5ZjUzYzMwNmJjZWM3YTI0MzFmMDRlOWY4Y2I3Mjk4OGY3NzI3ZWE5NDE4
+    NTRlYThiZmIxYjdjN2EzNzliNzk4ZDY0ZGQ2NzM5ZmM1Mzc5MzU=
   data.tar.gz: !binary |-
-    ZGJkYzViMjljNjMzODIwZmI0YjhmYzM2M2U1NWZmN2Q5NjZkM2M4MmJiOWNl
-    NmNmMjI5MTY1N2JkYzkyMWE0MTY1ZjgzNGNhNzEyZTE5ZWQwODdmNGQ4MzUz
-    MjM4OWRhNWYzODVkZTNlNTg5YzMzZmU2Njg2YjVkNjk0ZGRjYzI=
+    MzE1NTIzZDYzNTIyYjExN2NlM2RlOThkMzk4YTFkY2VmNWUwZDc1NDA1ZWQy
+    MDBkZTNhYTY4MWFlMmVhYzllYTBmNWM3MTY4Yzk3MDE2MjU1MGUxNjIwZGFl
+    OGEwODdjMjUxNDBlMTM1ZTA0ZTA5YjIzYjFmZTQzNWNiY2FiYTI=

data/README.md

@@ -0,0 +1,58 @@
+# natives
+
+Installs native library packages required by Ruby gems (normally with native extensions) on your machine. 
+
+It uses the [multi-platform catalog](https://github.com/teohm/natives-catalog/blob/master/catalogs/rubygems.yaml) maintained by [natives-catalog](https://github.com/teohm/natives-catalog) project.
+
+## Install
+
+```
+gem install natives
+```
+
+## Run
+``` 
+natives install curb capybara-webkit nokogiri sqlite3
+```
+It will try to install native packages required by the following gems: curb, capybara-webkit, nokogiri, sqlite.
+
+### Multi-catalog support
+
+```
+natives install --catalog npm sqlite3
+```
+By default, it uses `rubygems` catalog, but it's easy to tell `natives` to use another catalog.
+
+## Catalogs
+
+### System-wide
+
+By default, it uses [the catalog](https://github.com/teohm/natives-catalog/blob/master/catalogs/rubygems.yaml) shipped with [natives-catalog](https://github.com/teohm/natives-catalog) gem.
+
+To update the catalogs:
+
+```
+gem update natives-catalog
+```
+
+### Project-specific
+
+It also looks for a `natives-catalog` directory in current working directory, and loads any YAML catalog files in the directory.
+
+
+
+## Contributing to natives
+
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Fork the project.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+## Copyright
+
+Copyright (c) 2013 Huiming Teo. See LICENSE.txt for
+further details.
+

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/natives/app.rb

@@ -4,8 +4,8 @@ require 'chef/application/solo'
 
 module Natives
   class App
-    def install(packages)
-      create_tmp_attrs_file(Array(packages)) do |attrs_file|
+    def install(catalog_name, packages)
+      create_tmp_attrs_file(catalog_name.to_s, Array(packages)) do |attrs_file|
         run_chef_solo(attrs_file)
       end
     end
@@ -22,9 +22,9 @@ module Natives
       Chef::Application::Solo.new.run
     end
 
-    def create_tmp_attrs_file(packages, &block)
+    def create_tmp_attrs_file(catalog_name, packages, &block)
       file = Tempfile.new('natives.temp_attrs_file')
-      file.write(json_attrs(packages))
+      file.write(json_attrs(catalog_name, packages))
       file.flush
       file.rewind
       begin
@@ -44,11 +44,11 @@ module Natives
       File.absolute_path(File.join(File.dirname(__FILE__), '..', '..'))
     end
 
-    def json_attrs(packages)
+    def json_attrs(catalog_name, packages)
       {
         "natives" => {
           "install_list" => {
-            "rubygems" => packages
+            catalog_name => packages
           },
           "config" => {
             "working_dir" => current_working_dir

data/lib/natives/cli.rb

@@ -4,8 +4,11 @@ require 'natives/app'
 module Natives
   class Cli < Thor
     desc 'install PACKAGE1 PACKAGE2 ..', 'install a list of ruby packages'
+    method_option :catalog, default: 'rubygems',
+                            desc: 'set the catalog to be used',
+                            aliases: '-c'
     def install(*packages)
-      Natives::App.new.install(packages)
+      Natives::App.new.install options[:catalog], packages
     end
   end
 end

data/natives.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: natives 0.1.3 ruby lib
+# stub: natives 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "natives"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Huiming Teo"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables = ["natives"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "bin/natives",

data/spec/natives/app_spec.rb

@@ -7,18 +7,26 @@ describe Natives::App do
 
     it "forces packages argument to be an Array" do
       app.should_receive(:run_chef_solo)
-      app.should_receive(:create_tmp_attrs_file).with([]).and_call_original
+      app.should_receive(:create_tmp_attrs_file).with("foo", []).and_call_original
+
+      app.install("foo", nil)
+    end
+
+    it "forces catalog_name to be a String" do
+      app.should_receive(:run_chef_solo)
+      app.should_receive(:create_tmp_attrs_file).with("", []).and_call_original
+
+      app.install(nil, nil)
 
-      app.install(nil)
     end
   end
 
   describe "#create_tmp_attrs_file" do
     let(:app) { Natives::App.new }
 
-    it "generates a valid Chef JSON attrs file" do
+    it "generates a valid solo.json file" do
       json = nil
-      app.create_tmp_attrs_file(['foo', 'bar']) do |file|
+      app.create_tmp_attrs_file('rubygems', ['foo', 'bar']) do |file|
         json = JSON.parse(file.read)
       end
       expect(json).to eq({
@@ -33,9 +41,26 @@ describe Natives::App do
       })
     end
 
+    it "generates solo.json file based on the given catalog name" do
+      json = nil
+      app.create_tmp_attrs_file('npm', ['foo', 'bar']) do |file|
+        json = JSON.parse(file.read)
+      end
+      expect(json).to eq({
+        "natives" => {
+          "install_list" => {
+            "npm" => ["foo", "bar"]
+          },
+          "config" => {
+            "working_dir" => Dir.pwd
+          }
+        }
+      })
+    end
+
     it "handles empty package list" do
       json = nil
-      app.create_tmp_attrs_file([]) do |file|
+      app.create_tmp_attrs_file('rubygems', []) do |file|
         json = JSON.parse(file.read)
       end
       expect(json).to eq({

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: natives
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: !binary |-
+    MC4yLjA=
 platform: ruby
 authors:
 - Huiming Teo
@@ -147,14 +148,14 @@ executables:
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - .document
 - .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/natives

data/README.rdoc

@@ -1,19 +0,0 @@
-= natives
-
-Description goes here.
-
-== Contributing to natives
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2013 Huiming Teo. See LICENSE.txt for
-further details.
-