mixlib-install 0.8.0.alpha.3 → 0.8.0.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7db151f3905eb7a527cf687018366832a80a2811
-  data.tar.gz: 6186b2ea33ee9a2809084e768a33dcb57c162f00
+  metadata.gz: ee7bf2631eab8ab279e49e5b34a36406f2c06d4f
+  data.tar.gz: 6dac3a5b06c527426617b72e360d87bdd2cac075
 SHA512:
-  metadata.gz: fc15e3ca92d5ad638a1e9a35ff30b8cd07a88ab091b26816eaebf1de9849db3e97ec88d98c4afdd9cd78eb723276b11e90698dcdf89847a3f87379319cf6caff
-  data.tar.gz: d98e85481f590f9e77357bfcf4223620bdfcd7ca623343b20f7a3f174e1b0350c720794b45249de50c9aafc0f964486b0b9608736f09ddeff9155a468b713aea
+  metadata.gz: 65405d7904b3e509d77a143d062e4761764b587dc4fac7a2ec7db9b5d6e9715a120c5bd5af552ecfe424de4eade59fff23e79ead2d80dc1a0660e290019ed1e2
+  data.tar.gz: 68efc9a8eb3824e14fae9591974001b51c15ed784f92f927afc1c3131cf27867eed501205a3599f094f0e67d339015036876a7346d4ca67fa173adc3d3776e5c

data/PRODUCT_MATRIX.md

@@ -2,6 +2,7 @@
 | ------- | ------------ |
 | Analytics Platform | analytics |
 | Chef Client | chef |
+| Chef Backend | chef-backend |
 | Chef Server High Availability addon | chef-ha |
 | Chef Cloud Marketplace addon | chef-marketplace |
 | Chef Server | chef-server |

data/Rakefile

@@ -20,6 +20,7 @@ task test: [:rubocop, :spec]
 
 desc "Run unstable channel tests"
 task "unstable" do
+  Rake::Task["rubocop"].invoke
   system("bundle exec rspec -t unstable")
 end
 

data/lib/mixlib/install/backend/artifactory.rb

@@ -27,6 +27,7 @@ module Mixlib
       class Artifactory
         class ConnectionError < StandardError; end
         class AuthenticationError < StandardError; end
+        class NoArtifactsError < StandardError; end
 
         ENDPOINT = "http://artifactory.chef.co".freeze
 
@@ -44,50 +45,99 @@ module Mixlib
         # channel, product name, product version and platform info
         #
         def info
-          artifacts = artifactory_info.collect { |a| create_artifact(a) }
-
-          artifacts_for_version = artifacts.find_all do |a|
-            a.version == options.resolved_version(artifacts)
+          artifacts = if options.latest_version?
+            artifactory_latest
+          else
+            artifactory_artifacts(options.product_version)
           end
 
           if options.platform
-            artifacts_for_version.find do |a|
+            artifacts.select! do |a|
               a.platform == options.platform &&
                 a.platform_version == options.platform_version &&
                 a.architecture == options.architecture
             end
-          else
-            artifacts_for_version
           end
+
+          artifacts.length == 1 ? artifacts.first : artifacts
         end
 
-        # Fetches all artifacts from the configured Artifactory repository using
-        # channel and product name as search criteria
         #
-        # @return [Array<Hash>] list of artifactory hash data
+        # Get artifacts for the latest version, channel and product_name
+        #
+        # @return [Array<ArtifactInfo>] Array of info about found artifacts
+        def artifactory_latest
+          # Get the list of builds from the REST api.
+          # We do this because a user in the readers group does not have
+          # permissions to run aql against builds.
+          builds = client.get("/api/build/#{options.product_name}")
+
+          if builds.nil?
+            raise NoArtifactsError, <<-MSG
+Can not find any builds for #{options.product_name} in #{::Artifactory.endpoint}.
+            MSG
+          end
+
+          # Output we get is something like:
+          # {
+          #   "buildsNumbers": [
+          #     {"uri"=>"/12.5.1+20151213083009", "started"=>"2015-12-13T08:40:19.238+0000"},
+          #     {"uri"=>"/12.6.0+20160111212038", "started"=>"2016-01-12T00:25:35.762+0000"},
+          #     ...
+          #   ]
+          # }
+          # First we sort based on started
+          builds["buildsNumbers"].sort_by! { |b| b["started"] }.reverse!
+
+          # Now check if the build is in the requested channel or not
+          # Note that if you do this for any channel other than :unstable
+          # it will run a high number of queries but it is fine because we
+          # are using artifactory only for :unstable channel
+          builds["buildsNumbers"].each do |build|
+            version = build["uri"].gsub("/", "")
+            artifacts = artifactory_artifacts(version)
+
+            return artifacts unless artifacts.empty?
+          end
+
+          # we could not find any matching artifacts
+          []
+        end
+
         #
-        # Hash data:
-        #   download_uri: The full url download path
-        #   <property_name>: The names of the properties associcated to the artifact
+        # Get artifacts for a given version, channel and product_name
         #
-        def artifactory_info
-          query = <<-QUERY
+        # @return [Array<ArtifactInfo>] Array of info about found artifacts
+        def artifactory_artifacts(version)
+          results = artifactory_query(<<-QUERY)
 items.find(
   {"repo": "omnibus-#{options.channel}-local"},
-  {"@omnibus.project": "#{options.product_name}"}
+  {"@omnibus.project": "#{options.product_name}"},
+  {"@omnibus.version": "#{version}"}
 ).include("repo", "path", "name", "property")
           QUERY
 
-          results = artifactory_request do
-            client.post("/api/search/aql", query, "Content-Type" => "text/plain")
-          end
-
           # Merge artifactory properties and downloadUri to a flat Hash
-          results["results"].collect do |result|
+          results.collect! do |result|
             { "downloadUri" => generate_download_uri(result) }.merge(
               map_properties(result["properties"])
             )
           end
+
+          # Convert results to build records
+          results.map { |a| create_artifact(a) }
+        end
+
+        #
+        # Run an artifactory query for the given query.
+        #
+        # @return [Array<Hash>] Array of results returned from artifactory
+        def artifactory_query(query)
+          results = artifactory_request do
+            client.post("/api/search/aql", query, "Content-Type" => "text/plain")
+          end
+
+          results["results"]
         end
 
         def create_artifact(artifact_map)

data/lib/mixlib/install/generator/bourne/scripts/helpers.sh

@@ -136,7 +136,7 @@ do_wget() {
 # do_curl URL FILENAME
 do_curl() {
   echo "trying curl..."
-  curl -sL -D $tmp_dir/stderr "$1" > "$2"
+  curl --retry 5 -sL -D $tmp_dir/stderr "$1" > "$2"
   rc=$?
   # check for 404
   grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null
@@ -163,7 +163,7 @@ do_fetch() {
   return 0
 }
 
-# do_curl URL FILENAME
+# do_perl URL FILENAME
 do_perl() {
   echo "trying perl..."
   perl -e 'use LWP::Simple; getprint($ARGV[0]);' "$1" > "$2" 2>$tmp_dir/stderr
@@ -184,7 +184,7 @@ do_perl() {
   return 0
 }
 
-# do_curl URL FILENAME
+# do_python URL FILENAME
 do_python() {
   echo "trying python..."
   python -c "import sys,urllib2 ; sys.stdout.write(urllib2.urlopen(sys.argv[1]).read())" "$1" > "$2" 2>$tmp_dir/stderr
@@ -296,7 +296,7 @@ install_file() {
       echo "action=nocheck" >> $tmp_dir/nocheck
       echo "mail=" >> $tmp_dir/nocheck
       pkgrm -a $tmp_dir/nocheck -n $project >/dev/null 2>&1 || true
-      pkgadd -n -d "$2" -a $tmp_dir/nocheck $project
+      pkgadd -G -n -d "$2" -a $tmp_dir/nocheck $project
       ;;
     "pkg")
       echo "installing with installer..."

data/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh

@@ -25,7 +25,7 @@
 machine=`uname -m`
 os=`uname -s`
 
-if test -f "/etc/lsb-release" && grep -q DISTRIB_ID /etc/lsb-release; then
+if test -f "/etc/lsb-release" && grep -q DISTRIB_ID /etc/lsb-release && ! grep -q wrlinux /etc/lsb-release; then
   platform=`grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr '[A-Z]' '[a-z]'`
   platform_version=`grep DISTRIB_RELEASE /etc/lsb-release | cut -d "=" -f 2`
 elif test -f "/etc/debian_version"; then

data/lib/mixlib/install/generator/powershell.rb

@@ -75,7 +75,7 @@ module Mixlib
 
         def product_version
           if options.for_artifactory?
-            options.resolved_version(artifacts)
+            artifacts.first.version
           else
             options.product_version
           end

data/lib/mixlib/install/generator/powershell/scripts/get_project_metadata.ps1.erb

@@ -5,7 +5,7 @@ function Get-ProjectMetadata {
     .DESCRIPTION
     Get metadata for project
     .EXAMPLE
-    iex (new-object net.webclient).downloadstring('https:/omnitruck.chef.io/install.ps1'); Get-ProjectMetadata -project chef -channel stable
+    iex (new-object net.webclient).downloadstring('https://omnitruck.chef.io/install.ps1'); Get-ProjectMetadata -project chef -channel stable
 
     Gets the download url, MD5 checksum, and SHA256 checksum for the latest stable release of Chef.
     .EXAMPLE

data/lib/mixlib/install/generator/powershell/scripts/get_project_metadata_for_artifactory.ps1.erb

@@ -5,7 +5,7 @@ function Get-ProjectMetadata {
     .DESCRIPTION
     Get metadata for project
     .EXAMPLE
-    iex (new-object net.webclient).downloadstring('https:/omnitruck.chef.io/install.ps1'); Get-ProjectMetadata -project chef -channel stable
+    iex (new-object net.webclient).downloadstring('https://omnitruck.chef.io/install.ps1'); Get-ProjectMetadata -project chef -channel stable
 
     Gets the download url, MD5 checksum, and SHA256 checksum for the latest stable release of Chef.
     .EXAMPLE

data/lib/mixlib/install/generator/powershell/scripts/install_project.ps1

@@ -5,7 +5,7 @@ function Install-Project {
     .DESCRIPTION
     Install a Chef Software, Inc. product
     .EXAMPLE
-    iex (new-object net.webclient).downloadstring('https:/omnitruck.chef.io/install.ps1'); Install-Project -project chef -channel stable
+    iex (new-object net.webclient).downloadstring('https://omnitruck.chef.io/install.ps1'); Install-Project -project chef -channel stable
 
     Installs the latest stable version of Chef.
     .EXAMPLE

data/lib/mixlib/install/options.rb

@@ -91,23 +91,6 @@ module Mixlib
         product_version.to_sym == :latest
       end
 
-      def resolved_version(artifacts)
-        @resolved_version ||= begin
-          if latest_version?
-            all_versions = artifacts.collect(&:version)
-            # params: list of all versions, no version filtering, no pre-releases, use build version
-            Mixlib::Versioning.find_target_version(
-              all_versions,
-              nil,
-              false,
-              true
-            ).to_s
-          else
-            product_version
-          end
-        end
-      end
-
       private
 
       def validate_product_names

data/lib/mixlib/install/product.rb

@@ -155,6 +155,13 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     package_name "chef"
   end
 
+  product "chef-backend" do
+    product_name "Chef Backend"
+    package_name "chef-backend"
+    ctl_command "chef-backend-ctl"
+    config_file "/etc/chef-backend/chef-backend.rb"
+  end
+
   product "chef-ha" do
     product_name "Chef Server High Availability addon"
     package_name "chef-ha"
@@ -220,7 +227,13 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     ctl_command do |v|
       v < version_for("2.0.0") ? "opscode-manage-ctl" : "chef-manage-ctl"
     end
-    config_file "/etc/opscode-manage/manage.rb"
+    config_file do |v|
+      if v < version_for("2.0.0")
+        "/etc/opscode-manage/manage.rb"
+      else
+        "/etc/chef-manage/manage.rb"
+      end
+    end
   end
 
   product "private-chef" do

data/lib/mixlib/install/version.rb

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

data/support/install_command.ps1

@@ -3,13 +3,13 @@ Function Check-UpdateChef($root, $version) {
   elseif ("$version" -eq "true") { return $false }
   elseif ("$version" -eq "latest") { return $true }
 
-  Try { $chef_version = Get-Content $root\version-manifest.txt | select-object -1}
+  Try { $chef_version = (Get-Content $root\version-manifest.txt | select-object -first 1) }
   Catch {
-    Try { $chef_version = (& $root\bin\chef-solo.bat -v).split(" ", 2)[1] }
-    Catch { $chef_version = "" }
+    Try { $chef_version = (& $root\bin\chef-solo.bat -v) }
+    Catch { $chef_version = " " }
   }
 
-  if ($chef_version.StartsWith($version)) { return $false }
+  if ($chef_version.split(" ", 2)[1].StartsWith($version)) { return $false }
   else { return $true }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 0.8.0.alpha.3
+  version: 0.8.0.alpha.4
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory