mixlib-install 0.8.0.alpha.0 → 0.8.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1988cb752e5752ed1b0c356f95c821e1d3376570
-  data.tar.gz: 4a85a7442cc38bc55df9136f736eea91d6bd7bcd
+  metadata.gz: 4fabcb72fdaa90f9d22728c896b821671af560e3
+  data.tar.gz: 6f21894be53ccb12f66ff61c9df76c772c479683
 SHA512:
-  metadata.gz: 5464fd31ead9f86d3665c156cafe93b72ca7413fa7f34911aaee22bfcbf9ed9ed2858ae78064387a7f49db5d0b5e04e4498107a1a1d8012ee2f77f10b5655472
-  data.tar.gz: b3867d25ee74bb1d72e418a135dfe7b881601fec995319ca139f7e9721da37d749340570055dc1901de55b9682bb5e22de10404861346af4202d9a3bacb1d8df
+  metadata.gz: 97ace41631a3b9707d825e9b046f561f00a55c625f77f91775aa2db82e91c7f535c265254ef8f528a8fbcc09a77f3f1f59e986170fc40bf99e9e3fbe9d894cc7
+  data.tar.gz: f3effede4eebd11083b94dc884eb0e7995e75fb6f06a1517cefc9416fe6f2036cd3340dc9e8c30c0ce5cd8c32cdd700169d0152186288358d089c75536308b34

data/PRODUCT_MATRIX.md

@@ -0,0 +1,20 @@
+| Product | Product Key  |
+| ------- | ------------ |
+| Analytics Platform | analytics |
+| Chef Client | chef |
+| Chef Server High Availability addon | chef-ha |
+| Chef Cloud Marketplace addon | chef-marketplace |
+| Chef Server | chef-server |
+| Chef Server Replication addon | chef-sync |
+| Chef Development Kit | chefdk |
+| Chef Compliance | compliance |
+| Delivery | delivery |
+| Delivery CLI | delivery-cli |
+| Management Console | manage |
+| Enterprise Chef (legacy) | private-chef |
+| Chef Push Server | push-client |
+| Chef Push Server | push-server |
+| Chef Server Reporting addon | reporting |
+| Supermarket | supermarket |
+
+Do not modify this file manually. It is automatically rendered via a rake task.

data/Rakefile

@@ -17,3 +17,22 @@ end
 
 desc "Run all tests"
 task test: [:rubocop, :spec]
+
+desc "Render product matrix documentation"
+task "matrix" do
+  require "mixlib/install/product"
+
+  doc_file = File.join(File.dirname(__FILE__), "PRODUCT_MATRIX.md")
+  puts "Updating doc file at: #{doc_file}"
+
+  File.open(doc_file, "w+") do |f|
+    f.puts("| Product | Product Key  |")
+    f.puts("| ------- | ------------ |")
+    PRODUCT_MATRIX.products.sort.each do |p_key|
+      product = PRODUCT_MATRIX.lookup(p_key)
+      f.puts("| #{product.product_name} | #{p_key} |")
+    end
+    f.puts("")
+    f.puts("Do not modify this file manually. It is automatically rendered via a rake task.")
+  end
+end

data/acceptance/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/chef/chef-acceptance.git
-  revision: 2d1a192851a3731cb61f794d155ad2b156cdaec5
+  revision: e28d67891b0359af83836ec55c91eb07e8b062d1
   specs:
     chef-acceptance (0.2.0)
       thor (~> 0.19)
@@ -20,18 +20,20 @@ GIT
 PATH
   remote: ../
   specs:
-    mixlib-install (0.8.0)
+    mixlib-install (0.8.0.alpha.0)
       artifactory (~> 2.3.0)
+      mixlib-versioning (~> 1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    artifactory (2.3.1)
+    artifactory (2.3.2)
     coderay (1.1.0)
     kitchen-vagrant (0.19.0)
       test-kitchen (~> 1.4)
     method_source (0.8.2)
     mixlib-shellout (2.2.3)
+    mixlib-versioning (1.1.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)

data/acceptance/current/.acceptance/acceptance-cookbook/.gitignore

@@ -0,0 +1,2 @@
+tmp/
+nodes/

data/acceptance/current/.acceptance/acceptance-cookbook/recipes/destroy.rb

@@ -1,3 +1,3 @@
 execute 'kitchen destroy' do
-  cwd File.join(File.dirname(__FILE__), "../../../../../../../..")
+  cwd node['chef-acceptance']['suite-dir']
 end

data/acceptance/current/.acceptance/acceptance-cookbook/recipes/verify.rb

@@ -1,3 +1,3 @@
 execute 'kitchen verify' do
-  cwd File.join(File.dirname(__FILE__), "../../../../../../../..")
+  cwd node['chef-acceptance']['suite-dir']
 end

data/lib/mixlib/install/product.rb

@@ -0,0 +1,264 @@
+#
+# Copyright:: Copyright (c) 2015 Chef, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "mixlib/versioning"
+
+module Mixlib
+  class Install
+    class Product
+      def initialize(&block)
+        instance_eval(&block)
+      end
+
+      DSL_PROPERTIES = [
+        :config_file,
+        :ctl_command,
+        :package_name,
+        :product_name
+      ]
+
+      #
+      # DSL methods can receive either a String or a Proc to calculate the
+      # value of the property later on based on the version.
+      # We error out if we get both the String and Proc, and we return the value
+      # of the property if we do not receive anything.
+      #
+      # @param [String] prop_string
+      #   value to be set in String form
+      # @param [Proc] block
+      #   value to be set in Proc form
+      #
+      # @return [String] value of the property
+      #
+      DSL_PROPERTIES.each do |prop|
+        define_method prop do |prop_string = nil, &block|
+          if block.nil?
+            if prop_string.nil?
+              value = instance_variable_get("@#{prop}".to_sym)
+              return nil if value.nil?
+
+              if value.is_a? String
+                value
+              else
+                value.call(version_for(version))
+              end
+            else
+              instance_variable_set("@#{prop}".to_sym, prop_string)
+            end
+          else
+            raise "Can not use String and Proc at the same time for #{prop}." if !prop_string.nil?
+            instance_variable_set("@#{prop}".to_sym, block)
+          end
+        end
+      end
+
+      #
+      # Sets or retrieves the version for the product. This is used later
+      # when we are reading the value of a property if a Proc is specified
+      #
+      def version(value = nil)
+        if value.nil?
+          @version
+        else
+          @version = value
+        end
+      end
+
+      #
+      # Helper method to convert versions from String to Mixlib::Version
+      #
+      # @param [String] version_string
+      #   value to be set in String form
+      #
+      # @return [Mixlib::Version]
+      def version_for(version_string)
+        Mixlib::Versioning.parse(version_string)
+      end
+    end
+
+    class ProductMatrix
+      def initialize(&block)
+        @product_map = {}
+        instance_eval(&block)
+      end
+
+      #
+      # The only DSL method of this class. It creates a Product with given
+      # `key` and stores it.
+      #
+      def product(key, &block)
+        @product_map[key] = Product.new(&block)
+      end
+
+      #
+      # Fetches the keys of available products.
+      #
+      # @return Array[String] of keys
+      def products
+        @product_map.keys
+      end
+
+      #
+      # Looks up a product and sets version on it to be used later by the
+      # Product.
+      #
+      # @param [String] key
+      #   Lookup key of the product.
+      # @param [String] version
+      #   Version to be set for the product. By default version is set to :latest
+      #
+      # @return [Product]
+      def lookup(key, version = :latest)
+        product = @product_map[key]
+        # We set the lookup version for the product to a very high number in
+        # order to mimic :latest so that one does not need to handle this
+        # symbol explicitly when constructing logic based on version numbers.
+        version = "1000.1000.1000" if version.to_sym == :latest
+        product.version(version)
+        product
+      end
+    end
+  end
+end
+
+#
+# If you are making a change to PRODUCT_MATRIX, please make sure
+# you run `bundle exec rake matrix` at the home of this repository
+# to update PRODUCT_MATRIX.md.
+#
+PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
+  # Products in alphabetical order
+
+  product "analytics" do
+    product_name "Analytics Platform"
+    package_name "opscode-analytics"
+    ctl_command "opscode-analytics-ctl"
+    config_file "/etc/opscode-analytics/opscode-analytics.rb"
+  end
+
+  product "chef" do
+    product_name "Chef Client"
+    package_name "chef"
+  end
+
+  product "chef-ha" do
+    product_name "Chef Server High Availability addon"
+    package_name "chef-ha"
+    config_file "/etc/opscode/chef-server.rb"
+  end
+
+  product "chef-marketplace" do
+    product_name "Chef Cloud Marketplace addon"
+    package_name "chef-marketplace"
+    ctl_command "chef-marketplace-ctl"
+    config_file "/etc/chef-marketplace/marketplace.rb"
+  end
+
+  product "chef-server" do
+    product_name "Chef Server"
+    package_name do |v|
+      if (v < version_for("12.0.0")) && (v > version_for("11.0.0"))
+        "chef-server"
+      else
+        "chef-server-core"
+      end
+    end
+    ctl_command "chef-server-ctl"
+    config_file "/etc/opscode/chef-server.rb"
+  end
+
+  product "chef-sync" do
+    product_name "Chef Server Replication addon"
+    package_name "chef-sync"
+    ctl_command "chef-sync-ctl"
+    config_file "/etc/chef-sync/chef-sync.rb"
+  end
+
+  product "chefdk" do
+    product_name "Chef Development Kit"
+    package_name "chefdk"
+  end
+
+  product "compliance" do
+    product_name "Chef Compliance"
+    package_name "chef-compliance"
+    ctl_command "chef-compliance-ctl"
+    config_file "/etc/chef-compliance/chef-compliance.rb"
+  end
+
+  product "delivery" do
+    product_name "Delivery"
+    package_name "delivery"
+    ctl_command "delivery-ctl"
+    config_file "/etc/delivery/delivery.rb"
+  end
+
+  product "delivery-cli" do
+    product_name "Delivery CLI"
+    package_name "delivery-cli"
+  end
+
+  product "manage" do
+    product_name "Management Console"
+    package_name do |v|
+      v < version_for("2.0.0") ? "opscode-manage" : "chef-manage"
+    end
+    ctl_command do |v|
+      v < version_for("2.0.0") ? "opscode-manage-ctl" : "chef-manage-ctl"
+    end
+    config_file "/etc/opscode-manage/manage.rb"
+  end
+
+  product "private-chef" do
+    product_name "Enterprise Chef (legacy)"
+    package_name "private-chef"
+    ctl_command "private-chef-ctl"
+    config_file "/etc/opscode/private-chef.rb"
+  end
+
+  product "push-client" do
+    product_name "Chef Push Server"
+    package_name do |v|
+      v < version_for("1.3.0") ? "opscode-push-jobs-client" : "push-jobs-client"
+    end
+  end
+
+  product "push-server" do
+    product_name "Chef Push Server"
+    package_name do |v|
+      v < version_for("2.0.0") ? "opscode-push-jobs-server" : "push-jobs-server"
+    end
+    ctl_command do |v|
+      v < version_for("2.0.0") ? "opscode-push-jobs-server-ctl" : "push-jobs-server-ctl"
+    end
+    config_file "/etc/opscode-push-jobs-server/opscode-push-jobs-server.rb"
+  end
+
+  product "reporting" do
+    product_name "Chef Server Reporting addon"
+    package_name "opscode-reporting"
+    ctl_command "opscode-reporting-ctl"
+    config_file "/etc/opscode-reporting/opscode-reporting.rb"
+  end
+
+  product "supermarket" do
+    product_name "Supermarket"
+    package_name "supermarket"
+    ctl_command "supermarket-ctl"
+    config_file "/etc/supermarket/supermarket.json"
+  end
+end

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "0.8.0.alpha.0"
+    VERSION = "0.8.0.alpha.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 0.8.0.alpha.0
+  version: 0.8.0.alpha.1
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -110,12 +110,12 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
+- PRODUCT_MATRIX.md
 - README.md
 - Rakefile
-- acceptance/.gitignore
 - acceptance/Gemfile
 - acceptance/Gemfile.lock
-- acceptance/current/.acceptance/acceptance-cookbook/.chef/config.rb
+- acceptance/current/.acceptance/acceptance-cookbook/.gitignore
 - acceptance/current/.acceptance/acceptance-cookbook/metadata.rb
 - acceptance/current/.acceptance/acceptance-cookbook/recipes/destroy.rb
 - acceptance/current/.acceptance/acceptance-cookbook/recipes/provision.rb
@@ -134,6 +134,7 @@ files:
 - lib/mixlib/install/generator/bourne/scripts/install_package.sh
 - lib/mixlib/install/generator/bourne/scripts/platform_detection.sh
 - lib/mixlib/install/options.rb
+- lib/mixlib/install/product.rb
 - lib/mixlib/install/script_generator.rb
 - lib/mixlib/install/util.rb
 - lib/mixlib/install/version.rb

data/acceptance/.gitignore

@@ -1,2 +0,0 @@
-local-mode-cache/
-nodes/

data/acceptance/current/.acceptance/acceptance-cookbook/.chef/config.rb

@@ -1 +0,0 @@
-cookbook_path File.join(File.dirname(__FILE__), '..', '..')