natives 0.2.2 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGQ5NjE4YjhlOGE3Y2E1YWZiMGVlYzZmMDM2OWQyNGQzNzZmZTQwMw==
+    NjQ4ZmU0MzcyMTQyNjVjMzZmOGIxNzk3ZTU5YjcyOGU1ZTdhNGFlMg==
   data.tar.gz: !binary |-
-    ZDZmODY4MDI0MThiMmFmMGQyOTcwNmYxMTcwMDk5NjJjMTgzZjAyMg==
+    NWQ2NzcyOWM3ZjQ3ODExMzU2MzQzM2M2YzA0YWQ4MTE0Y2Q0NTYyNg==
 SHA512:
   metadata.gz: !binary |-
-    NmNiYWZjMTZhZjcxY2NkMmY4NmFkMGJjODE0MzMxY2E0MDg3MGVmN2Y3YmFl
-    OThlZjUzZGJmMmQ2ZTI1MjczMjljNjczNmQwMTY1ZTFjYzA2NWE1NmM2OTAx
-    NWIwZWQ2ODQyMmM0OTYzZGJmNGNhNzA3Y2E5NDZkM2JmMTIxNjM=
+    NTIzNzllZWNlYzI5OGJjZTIxOTRjNjBjNmQ1YTliMjJlNjRhZjlmZDk1ZjE1
+    NjU5OTJmMzBlMWQ0YTJmMmM5YmExOGRkOTVjODRhNWVmNzAxYWY0OWU4MWEz
+    OTRhM2ExYWI4ZmNhZjJlMGRiOTA1YzgzOTVkYzI5NmI0MjAyZWE=
   data.tar.gz: !binary |-
-    MjkzMWFiMzIzMjkzOTk1NjhmODUzMjEzMDYwYjdiZWFiYWRkNTY5ZTAzMGIw
-    YTVlZDljNDc3OGZlNzFiZDNiMzhlMWEwZTcwZGY5NmM3NmFjM2RhZWY0NDQ1
-    ZjFkYTMzOGM4MTAxNzZkMTVjNTE1YWY5ZTVhYmVjMzhkMmU1ZDg=
+    ZjNkYTFkNDU5OWU1MGQ3ZGEwZWQ0ZmNkZGM5ODJkMzQ4ODdkZjlkZDdiMzZm
+    YWRlOWI2MGFlMjA3MzRiNzZhOWIxNzc4MTFhYmVkYjUyOGY1OTAwZWIwZTMy
+    YTBkNzRmNGIxYjZiMzUzYmIwNDY5ZDkwNGE3YWE3YzUyYzYwNjk=

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 
 gem "chef", ">= 11.6.2"
-gem "natives-catalog", ">= 0.3.2"
+gem "natives-catalog", ">= 0.3.4"
 gem "thor"
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -69,7 +69,7 @@ GEM
     multi_json (1.8.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
-    natives-catalog (0.3.2)
+    natives-catalog (0.3.4)
     net-ssh (2.7.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
@@ -129,7 +129,7 @@ DEPENDENCIES
   bundler
   chef (>= 11.6.2)
   jeweler
-  natives-catalog (>= 0.3.2)
+  natives-catalog (>= 0.3.4)
   rdoc
   rspec
   simplecov

data/README.md

@@ -1,8 +1,8 @@
 # natives
 
-Installs native library packages required by Ruby gems (normally with native extensions) on your machine. 
+Installs native library packages required by gems 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.
+It lookups native packages from a [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
 
@@ -10,13 +10,22 @@ It uses the [multi-platform catalog](https://github.com/teohm/natives-catalog/bl
 gem install natives
 ```
 
-## Run
-``` 
+## Use
+```
 natives install curb capybara-webkit nokogiri sqlite3
 ```
-It will try to install native packages required by the following gems: curb, capybara-webkit, nokogiri, sqlite.
+It will lookup and install native packages (e.g. curl, qt, sqlite) required by the following gems: curb, capybara-webkit, nokogiri, sqlite3.
+
 
-### Multi-catalog support
+### Have a Gemfile?
+If current working directory has a Gemfile, `natives install` will automatically use the gems specified in the Gemfile.
+
+```
+natives install
+natives install --gemfile=path/to/Gemfile.special
+```
+
+### Switch catalog
 
 ```
 natives install --catalog npm sqlite3
@@ -37,8 +46,7 @@ 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.
-
+It also looks for a `natives-catalog/` directory in current working directory, and loads any YAML catalog files in the directory.
 
 
 ## Contributing to natives

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/bin/natives

@@ -1,4 +1,5 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -W0
+# encoding: UTF-8
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 

data/lib/natives/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'natives/app'
+require 'natives/gemfile_viewer'
 
 module Natives
   class Cli < Thor
@@ -7,8 +8,24 @@ module Natives
     method_option :catalog, default: 'rubygems',
                             desc: 'set the catalog to be used',
                             aliases: '-c'
+    method_option :gemfile, default: 'Gemfile'
     def install(*packages)
-      Natives::App.new.install options[:catalog], packages
+      catalog = options[:catalog]
+
+      if catalog == 'rubygems' && packages.empty?
+        packages = packages_in_gemfile(options[:gemfile])
+      end
+
+      puts "Catalog: #{catalog.inspect}\nPackages:\n#{packages.inspect}\n\n"
+
+      Natives::App.new.install catalog, packages
     end
+
+    protected
+
+    def packages_in_gemfile(gemfile_path)
+      Natives::GemfileViewer.new(gemfile_path).packages
+    end
+
   end
 end

data/lib/natives/gemfile_viewer.rb

@@ -0,0 +1,35 @@
+
+module Natives
+  class GemfileViewer
+    def initialize(gemfile_path)
+      @gemfile_path = gemfile_path
+    end
+
+    def packages
+      begin
+        # After several trial-and-error, this works:
+        # 1. cd to the dir containing the gemfile
+        # 2. after that run bundle show
+        gemfile_dir = File.expand_path(File.dirname(@gemfile_path))
+        gemfile_name = File.basename(@gemfile_path)
+        output = %x{cd '#{gemfile_dir}' && BUNDLE_GEMFILE=#{gemfile_name} bundle show 2>&1}
+        success = ($?.exitstatus == 0)
+        unless success
+          raise "Failed to list packages in Gemfile: #{@gemfile_path.inspect}\nReason:\n#{output}"
+        end
+      end
+      extract_packages(output)
+    end
+
+    protected
+
+    def extract_packages(output)
+      lines = output.split("\n")
+      lines.shift # remove first line
+      lines.map do |line|
+        _, name, _ = line.split(" ")
+        name
+      end
+    end
+  end
+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.2.2 ruby lib
+# stub: natives 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "natives"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Huiming Teo"]
-  s.date = "2013-11-04"
+  s.date = "2013-11-05"
   s.description = "Installs native library packages required by Ruby gems on different platforms, based on the catalog maintained by natives-catalog project."
   s.email = "teohuiming@gmail.com"
   s.executables = ["natives"]
@@ -72,8 +72,12 @@ Gem::Specification.new do |s|
     "lib/natives.rb",
     "lib/natives/app.rb",
     "lib/natives/cli.rb",
+    "lib/natives/gemfile_viewer.rb",
     "natives.gemspec",
+    "spec/fixtures/Gemfile.empty",
+    "spec/fixtures/Gemfile.empty.lock",
     "spec/natives/app_spec.rb",
+    "spec/natives/gemfile_viewer_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/teohm/natives"
@@ -87,7 +91,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<chef>, [">= 11.6.2"])
-      s.add_runtime_dependency(%q<natives-catalog>, [">= 0.3.2"])
+      s.add_runtime_dependency(%q<natives-catalog>, [">= 0.3.4"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
@@ -97,7 +101,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<chef>, [">= 11.6.2"])
-      s.add_dependency(%q<natives-catalog>, [">= 0.3.2"])
+      s.add_dependency(%q<natives-catalog>, [">= 0.3.4"])
       s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -108,7 +112,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<chef>, [">= 11.6.2"])
-    s.add_dependency(%q<natives-catalog>, [">= 0.3.2"])
+    s.add_dependency(%q<natives-catalog>, [">= 0.3.4"])
     s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/spec/fixtures/Gemfile.empty

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+

data/spec/fixtures/Gemfile.empty.lock

@@ -0,0 +1,8 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES

data/spec/natives/gemfile_viewer_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'natives/gemfile_viewer'
+
+describe Natives::GemfileViewer do
+  describe "#packages" do
+    it "list all gems specified in gemfile" do
+      gemfile_path = "spec/fixtures/Gemfile.empty"
+      gemfile = Natives::GemfileViewer.new(gemfile_path)
+      expect(gemfile.packages).to eq(['bundler'])
+    end
+
+    it "raises error when failed to list gems in gemfile" do
+      gemfile = Natives::GemfileViewer.new("gemfile_not_exist")
+      expect { gemfile.packages }.to raise_error
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natives
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Huiming Teo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -33,7 +33,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: !binary |-
-          MC4zLjI=
+          MC4zLjQ=
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: !binary |-
-          MC4zLjI=
+          MC4zLjQ=
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -203,8 +203,12 @@ files:
 - lib/natives.rb
 - lib/natives/app.rb
 - lib/natives/cli.rb
+- lib/natives/gemfile_viewer.rb
 - natives.gemspec
+- spec/fixtures/Gemfile.empty
+- spec/fixtures/Gemfile.empty.lock
 - spec/natives/app_spec.rb
+- spec/natives/gemfile_viewer_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/teohm/natives
 licenses: