natives 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQ4ZmU0MzcyMTQyNjVjMzZmOGIxNzk3ZTU5YjcyOGU1ZTdhNGFlMg==
+    YjhlODM3ZWJiNzkwMTY3ZDEwN2Y4YzY2NjJhN2Q0NmQ0NTFmOTk2Zg==
   data.tar.gz: !binary |-
-    NWQ2NzcyOWM3ZjQ3ODExMzU2MzQzM2M2YzA0YWQ4MTE0Y2Q0NTYyNg==
+    MWNjYTc2Njg3MmJmYzg4OTUxNDQwMjhkNDZlYjk3OWZlNDRhNGZiOA==
 SHA512:
   metadata.gz: !binary |-
-    NTIzNzllZWNlYzI5OGJjZTIxOTRjNjBjNmQ1YTliMjJlNjRhZjlmZDk1ZjE1
-    NjU5OTJmMzBlMWQ0YTJmMmM5YmExOGRkOTVjODRhNWVmNzAxYWY0OWU4MWEz
-    OTRhM2ExYWI4ZmNhZjJlMGRiOTA1YzgzOTVkYzI5NmI0MjAyZWE=
+    OTFlNjI1MjU0YzY2NjU1YTNhZTIyYzJmODhlZGJkY2M3YTMxMzdlOGQ5Mjky
+    YThhNTJlZjBjYzVhNzEwZDBlYjZiOTEzNGZmMWY2OWZiMzE1YmRmNTM2YjU0
+    YjA5YTQ3Zjc1OTQwODg2MzRiZDlkMTMwMmI5NTA1N2VmMmQzNjQ=
   data.tar.gz: !binary |-
-    ZjNkYTFkNDU5OWU1MGQ3ZGEwZWQ0ZmNkZGM5ODJkMzQ4ODdkZjlkZDdiMzZm
-    YWRlOWI2MGFlMjA3MzRiNzZhOWIxNzc4MTFhYmVkYjUyOGY1OTAwZWIwZTMy
-    YTBkNzRmNGIxYjZiMzUzYmIwNDY5ZDkwNGE3YWE3YzUyYzYwNjk=
+    NDk5ZjNmNjdlMmI0OWE0ZDc5Y2Q5MjcxYjEyYjU2ZWMwMzBjMDNhOGY0YzE2
+    ZDRmODk2MWRhYTkyMDJmMTU3OTlmMTQ4ZjJiZDliZDdiNmU5ZWU3NmY0M2Ni
+    OTIxMGM0MmQ2ODQwNTc3YWMxOGRiMWE5YjcyMjZhZjRlMTQ2OWQ=

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/chef/cookbooks/natives/recipes/default.rb

@@ -9,18 +9,20 @@
 
 require 'natives/catalog'
 
-include_recipe 'homebrew' if use_homebrew?
-include_recipe 'apt' if use_apt?
+if node['natives']['configs']['update_provider']
+  include_recipe('homebrew') if use_homebrew?
+  include_recipe('apt') if use_apt?
+end
 
 natives_install_list.each do |catalog_name, entries|
   catalog = Natives::Catalog.new(
     catalog_name,
     node[:platform], node[:platform_version],
     current_package_provider,
-    working_dir: node['natives']['config']['working_dir']
+    working_dir: node['natives']['configs']['working_dir']
   )
-
   packages = catalog.native_packages_for(entries)
+
   packages.each do |package_name|
     package package_name do
       action :install

data/chef/solo.rb

@@ -1,4 +1,4 @@
-log_level :warn
+log_level :error
 
 base_path = File.absolute_path(File.join(File.dirname(__FILE__)))
 

data/lib/natives/app.rb

@@ -4,9 +4,13 @@ require 'chef/application/solo'
 
 module Natives
   class App
-    def install(catalog_name, packages)
-      create_solo_json_tempfile(catalog_name.to_s,
-                                Array(packages)) do |attrs_file|
+    def install(catalog_name, packages, configs={})
+      create_solo_json_tempfile(
+        catalog_name.to_s,
+        Array(packages),
+        default_configs.merge(configs || {})
+
+      ) do |attrs_file|
         run_chef_solo(attrs_file)
       end
     end
@@ -23,9 +27,9 @@ module Natives
       Chef::Application::Solo.new.run
     end
 
-    def create_solo_json_tempfile(catalog_name, packages, &block)
+    def create_solo_json_tempfile(catalog_name, packages, configs, &block)
       file = Tempfile.new('natives.temp_attrs_file')
-      file.write(json_attrs(catalog_name, packages))
+      file.write(json_attrs(catalog_name, packages, configs))
       file.flush
       file.rewind
       begin
@@ -35,6 +39,11 @@ module Natives
       end
     end
 
+    def default_configs
+      {
+        working_dir: current_working_dir
+      }
+    end
     protected
 
     def current_working_dir
@@ -45,15 +54,13 @@ module Natives
       File.absolute_path(File.join(File.dirname(__FILE__), '..', '..'))
     end
 
-    def json_attrs(catalog_name, packages)
+    def json_attrs(catalog_name, packages, configs)
       {
         "natives" => {
           "install_list" => {
             catalog_name => packages
           },
-          "config" => {
-            "working_dir" => current_working_dir
-          }
+          "configs" => configs
         }
       }.to_json
     end

data/lib/natives/cli.rb

@@ -4,21 +4,39 @@ require 'natives/gemfile_viewer'
 
 module Natives
   class Cli < Thor
-    desc 'install PACKAGE1 PACKAGE2 ..', 'install a list of ruby packages'
+    default_task :install
+
+    desc 'install [ENTRY1 ENTRY2 ..]',
+         'install native packages required by the catalog entries'
+
     method_option :catalog, default: 'rubygems',
-                            desc: 'set the catalog to be used',
-                            aliases: '-c'
-    method_option :gemfile, default: 'Gemfile'
+      aliases: '-c',
+      desc: 'use this catalog'
+    method_option :gemfile, default: 'Gemfile',
+      desc: 'use gems in the gemfile as the catalog entries'
+    method_option :"update-provider", type: 'boolean',
+      default: false,
+      aliases: '-u',
+      desc: "update package provider's repo (eg. apt-get update)"
+
     def install(*packages)
       catalog = options[:catalog]
-
+      configs = {
+        update_provider: options['update-provider']
+      }
       if catalog == 'rubygems' && packages.empty?
         packages = packages_in_gemfile(options[:gemfile])
       end
 
-      puts "Catalog: #{catalog.inspect}\nPackages:\n#{packages.inspect}\n\n"
+      puts "catalog: #{catalog.inspect}"
+      puts "entries: #{packages.inspect}"
+      puts "configs: #{configs}"
+      puts ""
+
+      Natives::App.new.install(catalog, packages, configs)
 
-      Natives::App.new.install catalog, packages
+    rescue => ex
+      $stderr.puts ex.message
     end
 
     protected

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.3.0 ruby lib
+# stub: natives 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "natives"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Huiming Teo"]

data/spec/natives/app_spec.rb

@@ -7,7 +7,8 @@ describe Natives::App do
 
     it "forces packages argument to be an Array" do
       app.should_receive(:run_chef_solo)
-      app.should_receive(:create_solo_json_tempfile).with("foo", []).
+      app.should_receive(:create_solo_json_tempfile).
+        with("foo", [], app.default_configs).
         and_call_original
 
       app.install("foo", nil)
@@ -15,11 +16,29 @@ describe Natives::App do
 
     it "forces catalog_name to be a String" do
       app.should_receive(:run_chef_solo)
-      app.should_receive(:create_solo_json_tempfile).with("", []).
+      app.should_receive(:create_solo_json_tempfile).
+        with("", ['foo', 'bar'], app.default_configs).
         and_call_original
 
-      app.install(nil, nil)
+      app.install(nil, ['foo', 'bar'])
+    end
+
+    it "merges configs with default configs" do
+      app.should_receive(:run_chef_solo)
+      app.should_receive(:create_solo_json_tempfile).
+        with("foobar", ['foo', 'bar'], app.default_configs.merge({foo: false})).
+        and_call_original
+
+      app.install('foobar', ['foo', 'bar'], {foo: false})
+    end
+
+    it "treats nil configs as empty hash" do
+      app.should_receive(:run_chef_solo)
+      app.should_receive(:create_solo_json_tempfile).
+        with("foobar", ['foo', 'bar'], app.default_configs).
+        and_call_original
 
+      app.install('foobar', ['foo', 'bar'], nil)
     end
   end
 
@@ -28,7 +47,10 @@ describe Natives::App do
 
     it "generates a valid solo.json file" do
       json = nil
-      app.create_solo_json_tempfile('rubygems', ['foo', 'bar']) do |file|
+      app.create_solo_json_tempfile(
+        'rubygems',
+        ['foo', 'bar'],
+        {working_dir: '/path/to/working_dir'}) do |file|
         json = JSON.parse(file.read)
       end
       expect(json).to eq({
@@ -36,8 +58,8 @@ describe Natives::App do
           "install_list" => {
             "rubygems" => ["foo", "bar"]
           },
-          "config" => {
-            "working_dir" => Dir.pwd
+          "configs" => {
+            "working_dir" => '/path/to/working_dir'
           }
         }
       })
@@ -45,7 +67,9 @@ describe Natives::App do
 
     it "generates solo.json file based on the given catalog name" do
       json = nil
-      app.create_solo_json_tempfile('npm', ['foo', 'bar']) do |file|
+      app.create_solo_json_tempfile(
+        'npm', ['foo', 'bar'],
+        {working_dir: '/path/to/foo'}) do |file|
         json = JSON.parse(file.read)
       end
       expect(json).to eq({
@@ -53,8 +77,8 @@ describe Natives::App do
           "install_list" => {
             "npm" => ["foo", "bar"]
           },
-          "config" => {
-            "working_dir" => Dir.pwd
+          "configs" => {
+            "working_dir" => '/path/to/foo'
           }
         }
       })
@@ -62,7 +86,7 @@ describe Natives::App do
 
     it "handles empty package list" do
       json = nil
-      app.create_solo_json_tempfile('rubygems', []) do |file|
+      app.create_solo_json_tempfile('rubygems', [], {}) do |file|
         json = JSON.parse(file.read)
       end
       expect(json).to eq({
@@ -70,8 +94,7 @@ describe Natives::App do
           "install_list" => {
             "rubygems" => []
           },
-          "config" => {
-            "working_dir" => Dir.pwd
+          "configs" => {
           }
 
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: natives
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Huiming Teo