mixlib-install 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7592663e9dc88898464abf226ad8b1e905331e23
-  data.tar.gz: 689ed39a2569a84473a9fe542cd44340c2d82359
+  metadata.gz: ecaa8915b2caba7f9a5cf72b0764b911232a9ed4
+  data.tar.gz: b993b484009f8d4d27b18d3dbb3a92e6d8661273
 SHA512:
-  metadata.gz: bc3f0cc2bc318043963135505b1a3a8c9bd34daec489d8cd6b642f35f5274825d545128a0b9744571f7e0bfc3ad2cb4572aa3c90670959bdd01b09f47cc366de
-  data.tar.gz: 75411cd38ab03f9518d3b98f74f058d4ac9356da97356b11e79b42e759b4bdee787c46842fb2ba9549f89b61423b85f71035ef6ad3e121088f0bca14c34cf556
+  metadata.gz: c661c621177bbe5010f31245662b6481a09e01e0f9dbfb67f706bc0ff6aa292c337cc15d8200dd2c761798f2561e4d0230aee57e0facb648118d38aefeec37ee
+  data.tar.gz: f28da052b3f374e165e54161151cd9b3ae858b36579aa81038e944b826cf3037ac4f9c5b2bc0948d7e0fce8da717a9dea6c70e54d5dd7e8e2123464be3ee42db

data/lib/mixlib/install.rb

@@ -36,14 +36,35 @@ module Mixlib
     attr_accessor :root
 
     attr_accessor :use_sudo
-    attr_accessor :sudo_command
+
+    attr_reader :sudo_command
+
+    def sudo_command=(cmd)
+      if cmd.nil?
+        @use_sudo = false
+      else
+        @sudo_command = cmd
+      end
+    end
 
     attr_accessor :http_proxy
     attr_accessor :https_proxy
 
-    attr_accessor :base_url
+    attr_accessor :omnibus_url
     attr_accessor :install_msi_url
 
+    VALID_INSTALL_OPTS = %w(omnibus_url
+                            endpoint
+                            http_proxy
+                            https_proxy
+                            install_flags
+                            install_msi_url
+                            nightlies
+                            prerelease
+                            project
+                            use_sudo
+                            sudo_command)
+
     def initialize(version, powershell = false, opts = {})
       @version = version
       @powershell = powershell
@@ -53,7 +74,7 @@ module Mixlib
       @prerelease = false
       @nightly = false
       @endpoint = "metadata"
-      @base_url = "https://www.chef.io/chef/install.sh"
+      @omnibus_url = "https://www.chef.io/chef/install.sh"
       @use_sudo = true
       @sudo_command = "sudo -E"
 
@@ -90,7 +111,7 @@ module Mixlib
 
       [
         shell_var("chef_omnibus_root", root),
-        shell_var("chef_omnibus_url", base_url),
+        shell_var("chef_omnibus_url", omnibus_url),
         shell_var("install_flags", flags.strip),
         shell_var("pretty_version", Util.pretty_version(version)),
         shell_var("sudo_sh", sudo("sh")),
@@ -120,31 +141,21 @@ module Mixlib
       }.join("\n")
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    def validate_opts!(opt)
+      err_msg = ["#{opt} is not a valid option",
+                 "valid options are #{VALID_INSTALL_OPTS.join(' ')}"].join(',')
+      fail ArgumentError, err_msg unless VALID_INSTALL_OPTS.include?(opt.to_s)
+    end
+
+    # rubocop:disable Metrics/MethodLength
     def parse_opts(opts)
       opts.each do |opt, setting|
+        validate_opts!(opt)
         case opt.to_s
-        when "http_proxy"
-          self.http_proxy = setting
-        when "https_proxy"
-          self.https_proxy = setting
-        when "install_flags"
-          self.install_flags = setting
-        when "prerelease"
-          self.prerelease = setting
-        when "endpoint"
+        when 'project', 'endpoint'
           self.endpoint = metadata_endpoint_from_project(setting)
-        when "base"
-          self.base_url = setting
-        when "nightlies"
-          self.nightlies = setting
-        when "sudo"
-          self.use_sudo = setting
-        when "sudo_command"
-          self.use_sudo = true
-          self.sudo_command = setting
-        when "install_msi_url"
-          self.install_msi_url = setting
+        else
+          send("#{opt.to_sym}=", setting)
         end
       end
     end
@@ -179,8 +190,8 @@ module Mixlib
     end
 
     def windows_metadata_url
-      base = if base_url =~ %r{/install.sh$}
-        "#{File.dirname(base_url)}/"
+      base = if omnibus_url =~ %r{/install.sh$}
+        "#{File.dirname(omnibus_url)}/"
       end
 
       url = "#{base}#{endpoint}"

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Thom May
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler