mixlib-install 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4bbebe8c34d32ee85913bbc2909706b61eae0c1
-  data.tar.gz: 8bacb078f62eac0966167958adb11042aec45790
+  metadata.gz: 8fa0731a332dd953d20aa43e53480e804409aa0f
+  data.tar.gz: 6df34bf9b664cda250fd3c312980630a4e95c386
 SHA512:
-  metadata.gz: 3b614b75aa5bafd8f8f75b472628f4a452a2c343d83df7738c1b5c02eceb615cf7fcc4bc50ccf01d7110551db7c84ea384c0571e9783195d309a01e5ea751177
-  data.tar.gz: 6921b10c9c5d86b4cecd87ac2ddd88c319d115684d7afa8d6fa76973bf01ef8d9dd009beae092511b27698a07ca6380df86a154fd65c6fe79d9617e046d599f6
+  metadata.gz: 5f6455a5e05a9cd10cdf54600bc8fd2e7b95599cb64f4ee8021ffb53b721dc83d3d94bafae43c1d5dc9f234c3a6bd7e84b2b9d791daaaf4999e22fb24019340b
+  data.tar.gz: 72542b720536309e129357a835931e88812d3d973ab98fd6e2b38594f898931b37c71bb1713f40cd63c0906d872f05df3a705779ee7ca753beb6554eb841d82c

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [1.0.3]
+### Changed
+- Artifactory credentials are no longer required.  A designated account has been hard-coded as default.
+- Exception is raised if Bintray can not find the version for channel/product.
+
+### Fixed
+- freebsd 9 artifacts return chef.bintray.com based urls
+
 ## [1.0.2]
 ### Added
 - Use 32 bit windows artifacts for 64-bit, when there is no 64-bit native artifact.

data/README.md

@@ -51,14 +51,11 @@ artifact.platform_version # => "10.10"
 
 ## Unstable channel
 The `:unstable` channel is currently only available when connected to Chef's internal network.
-Configure Artifactory access by setting the following environment variables:
-```
-export ARTIFACTORY_USERNAME='username'
-export ARTIFACTORY_PASSWORD='password'
-```
 
-### Unstable channel specs
-Some spec examples are tagged `:unstable` and can only run when connected to Chef's internal network.  These are excluded by default.  To run the `:unstable` tests run: `rake unstable`.
+## Development
+Since mixlib-install needs to interact with Bintray and Artifactory and since Artifactory instances are only available in Chef's network, this project uses [vcr](https://github.com/vcr/vcr).
+
+VCR is a tool that helps cache and replay http responses. When these responses change or when you add more tests you might need to update cached responses. Check out [spec_helper.rb](https://github.com/chef/mixlib-install/blob/master/spec/spec_helper.rb) for instructions on how to do this.
 
 ## Contributing
 

data/Rakefile

@@ -19,19 +19,7 @@ rescue LoadError
 end
 
 desc "Run all tests"
-task test: [:style, :spec, :unstable]
-
-desc "Run unstable channel tests"
-task "unstable" do
-  if ENV["ARTIFACTORY_USERNAME"].nil? || ENV["ARTIFACTORY_PASSWORD"].nil?
-    abort <<-EOS.gsub(/^\s+/, "")
-      Must set ARTIFACTORY_USERNAME and ARTIFACTORY_PASSWORD environment
-      variables to run unstable tests
-    EOS
-  end
-  Rake::Task["style"].invoke
-  system("bundle exec rspec -t unstable")
-end
+task test: [:style, :spec]
 
 desc "Run tests for Travis CI"
 task ci: [:style, :spec]

data/lib/mixlib/install/backend.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require "mixlib/install/backend/omnitruck"
 require "mixlib/install/backend/artifactory"
 require "mixlib/install/backend/bintray"
 

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

@@ -32,6 +32,11 @@ module Mixlib
 
         ENDPOINT = "http://artifactory.chef.co".freeze
 
+        # These credentials are read-only credentials in Chef's artifactory
+        # server which is only available in Chef's internal network.
+        ARTIFACTORY_USERNAME = "mixlib-install".freeze
+        ARTIFACTORY_PASSWORD = "%mKPtzbT1JH1wm333kjkkjs39oeuFLgZ8vNoOdLBPd)TZAJsURs9w0HloWR$l6h".freeze
+
         # Create filtered list of artifacts
         #
         # @return [Array<ArtifactInfo>] list of artifacts for the configured
@@ -174,8 +179,8 @@ items.find(
         def client
           @client ||= ::Artifactory::Client.new(
             endpoint: endpoint,
-            username: ENV["ARTIFACTORY_USERNAME"],
-            password: ENV["ARTIFACTORY_PASSWORD"]
+            username: ARTIFACTORY_USERNAME,
+            password: ARTIFACTORY_PASSWORD
           )
         end
 
@@ -193,10 +198,7 @@ the endpoint is correct and there is an open connection to Chef's private networ
             MSG
           rescue ::Artifactory::Error::HTTPError => e
             if e.code == 401 && e.message =~ /Bad credentials/
-              raise AuthenticationError, <<-MSG
-Artifactory server denied credentials. Verify ARTIFACTORY_USERNAME and
-ARTIFACTORY_PASSWORD environment variables are configured properly.
-              MSG
+              raise AuthenticationError, "Artifactory server denied credentials."
             else
               raise e
             end

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

@@ -38,15 +38,14 @@ module Mixlib
     class Backend
       class Bintray < Base
         class UnknownArchitecture < StandardError; end
-
-        ENDPOINT = "https://bintray.com/api/v1/".freeze
-
+        class VersionNotFound < StandardError; end
         # Bintray credentials for api read access. These are here intentionally.
         BINTRAY_USERNAME = "mixlib-install@chef".freeze
-
         BINTRAY_PASSWORD = "a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d".freeze
 
+        ENDPOINT = "https://bintray.com/api/v1/".freeze
         DOWNLOAD_URL_ENDPOINT = "https://packages.chef.io".freeze
+        COMPAT_DOWNLOAD_URL_ENDPOINT = "http://chef.bintray.com".freeze
 
         def endpoint
           @endpoint ||= ENV.fetch("BINTRAY_ENDPOINT", ENDPOINT)
@@ -114,15 +113,25 @@ module Mixlib
         #
         def bintray_artifacts
           version = options.latest_version? ? latest_version : options.product_version
-          results = bintray_get("#{options.channel}/#{options.product_name}/versions/#{version}/files")
+          begin
+            results = bintray_get("#{options.channel}/#{options.product_name}/versions/#{version}/files")
+          rescue Net::HTTPServerException => e
+            if e.message =~ /404 "Not Found"/
+              raise VersionNotFound,
+                "Specified version (#{version}) not found for #{options.product_name} in #{options.channel} channel."
+            else
+              raise
+            end
+          end
 
           #
-          # Delete .asc files
-          # Also delete .pkg files which are uploaded along with dmg files for
+          # Delete files that we don't want as part of the artifact info array
+          # Windows: .asc files
+          # MAC OS _X: .pkg files which are uploaded along with dmg files for
           # some chef versions.
           #
-          results.reject! do |r|
-            r["name"].end_with?(".asc") || r["name"].end_with?(".pkg")
+          %w{ asc pkg }.each do |ext|
+            results.reject! { |r| r["name"].end_with?(".#{ext}") }
           end
 
           # Convert results to build records
@@ -182,8 +191,6 @@ module Mixlib
         def create_artifact(artifact_map)
           platform_info = parse_platform_info(artifact_map)
 
-          url = "#{DOWNLOAD_URL_ENDPOINT}/#{options.channel}/#{artifact_map["path"]}"
-
           ArtifactInfo.new(
             sha1:             artifact_map["sha1"],
             sha256:           artifact_map["sha256"],
@@ -191,10 +198,36 @@ module Mixlib
             platform:         platform_info[:platform],
             platform_version: platform_info[:platform_version],
             architecture:     platform_info[:architecture],
-            url:              url
+            url:              url(artifact_map)
           )
         end
 
+        #
+        # Creates the URL for the artifact.
+        #
+        # For some older platform & platform_version combinations we need to
+        # use COMPAT_DOWNLOAD_URL_ENDPOINT since these versions have an
+        # OpenSSL version that can not verify the DOWNLOAD_URL_ENDPOINT
+        # based urls
+        #
+        # @param artifact_map
+        #   see #create_artifact for details.
+        #
+        # @return [String] url for the artifact
+        #
+        def url(artifact_map)
+          platform_info = parse_platform_info(artifact_map)
+
+          base_url = case "#{platform_info[:platform]}-#{platform_info[:platform_version]}"
+                     when "freebsd-9"
+                       COMPAT_DOWNLOAD_URL_ENDPOINT
+                     else
+                       DOWNLOAD_URL_ENDPOINT
+                     end
+
+          "#{base_url}/#{options.channel}/#{artifact_map["path"]}"
+        end
+
         #
         # Parses platform info
         #

data/lib/mixlib/install/options.rb

@@ -23,7 +23,6 @@ module Mixlib
   class Install
     class Options
       class InvalidOptions < ArgumentError; end
-      class ArtifactoryCredentialsNotFound < StandardError; end
 
       attr_reader :options
 
@@ -50,7 +49,6 @@ module Mixlib
 
       def validate!
         validate_options!
-        validate_unstable_channel! if for_artifactory?
       end
 
       def validate_options!
@@ -139,15 +137,6 @@ Must be one of: #{SUPPORTED_SHELL_TYPES.join(", ")}
         end
       end
 
-      def validate_unstable_channel!
-        if ENV["ARTIFACTORY_USERNAME"].nil? || ENV["ARTIFACTORY_PASSWORD"].nil?
-          raise ArtifactoryCredentialsNotFound,
-                <<-EOS
-Must set ARTIFACTORY_USERNAME and ARTIFACTORY_PASSWORD environment variables
-when using the unstable channel.
-                EOS
-        end
-      end
     end
   end
 end

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/mixlib-install.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "sinatra"
+  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "webmock"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -110,7 +110,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="