[DRE-commits] [ruby-mixlib-install] 02/15: Disable artifactory usage

[Hleb Valoshka]

This is an automated email from the git hooks/post-receive script.

tsfgnu-guest pushed a commit to branch master
in repository ruby-mixlib-install.

commit 364339f864e4739d379cd6944be3735b4231faf6
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Mon May 30 16:54:33 2016 +0300

    Disable artifactory usage
---
 .../patches/0002-Disable-artifactory-usage.patch   | 88 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 89 insertions(+)

diff --git a/debian/patches/0002-Disable-artifactory-usage.patch b/debian/patches/0002-Disable-artifactory-usage.patch
new file mode 100644
index 0000000..87d5ae3
--- /dev/null
+++ b/debian/patches/0002-Disable-artifactory-usage.patch
@@ -0,0 +1,88 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Mon, 30 May 2016 16:54:15 +0300
+Subject: Disable artifactory usage
+
+This works in local chef.io network only
+---
+ lib/mixlib/install/backend.rb              | 3 +--
+ lib/mixlib/install/generator/bourne.rb     | 3 +--
+ lib/mixlib/install/generator/powershell.rb | 4 ++--
+ mixlib-install.gemspec                     | 1 -
+ 4 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/lib/mixlib/install/backend.rb b/lib/mixlib/install/backend.rb
+index 7560859..9a809a1 100644
+--- a/lib/mixlib/install/backend.rb
++++ b/lib/mixlib/install/backend.rb
+@@ -16,7 +16,6 @@
+ # limitations under the License.
+ #
+ 
+-require "mixlib/install/backend/artifactory"
+ require "mixlib/install/backend/bintray"
+ 
+ module Mixlib
+@@ -24,7 +23,7 @@ module Mixlib
+     class Backend
+       def self.info(options)
+         backend = if options.for_artifactory?
+-                    Backend::Artifactory.new(options)
++                    raise "Artifactory is disabled in Debian package"
+                   else
+                     Backend::Bintray.new(options)
+                   end
+diff --git a/lib/mixlib/install/generator/bourne.rb b/lib/mixlib/install/generator/bourne.rb
+index 654765f..f6d366b 100644
+--- a/lib/mixlib/install/generator/bourne.rb
++++ b/lib/mixlib/install/generator/bourne.rb
+@@ -16,7 +16,6 @@
+ #
+ 
+ require "mixlib/install/generator/base"
+-require "mixlib/install/backend/artifactory"
+ 
+ module Mixlib
+   class Install
+@@ -47,7 +46,7 @@ module Mixlib
+           install_command << render_variables
+           install_command << get_script("platform_detection.sh")
+           if options.for_artifactory?
+-            install_command << artifactory_urls
++            raise "Artifactory is disabled in Debian package"
+           else
+             install_command << get_script("fetch_metadata.sh")
+           end
+diff --git a/lib/mixlib/install/generator/powershell.rb b/lib/mixlib/install/generator/powershell.rb
+index c5a82cf..1be4ddb 100644
+--- a/lib/mixlib/install/generator/powershell.rb
++++ b/lib/mixlib/install/generator/powershell.rb
+@@ -47,7 +47,7 @@ module Mixlib
+           install_project_module = []
+           install_project_module << get_script("helpers.ps1")
+           install_project_module << if options.for_artifactory?
+-                                      artifactory_urls
++                                      raise "Artifactory is disabled in Debian package"
+                                     else
+                                       get_script("get_project_metadata.ps1")
+                                     end
+@@ -82,7 +82,7 @@ module Mixlib
+ 
+         def product_version
+           if options.for_artifactory?
+-            artifacts.first.version
++            raise "Artifactory is disabled in Debian package"
+           else
+             options.product_version
+           end
+diff --git a/mixlib-install.gemspec b/mixlib-install.gemspec
+index b619a7e..5dffda3 100644
+--- a/mixlib-install.gemspec
++++ b/mixlib-install.gemspec
+@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
+   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+   spec.require_paths = ["lib"]
+ 
+-  spec.add_dependency "artifactory"
+   spec.add_dependency "mixlib-versioning"
+   spec.add_dependency "mixlib-shellout"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 85bda64..f3fbd43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Look-for-support-scripts-in-usr-share.patch
+0002-Disable-artifactory-usage.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-mixlib-install.git