diff options
author | Nathan Cerny <nathan.cerny@cerner.com> | 2014-11-11 10:42:13 -0600 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-13 12:39:38 -0800 |
commit | ac270ac158e8fa5f26e94654158902cea8273166 (patch) | |
tree | c13bf86a82f77b8ec4a2ce907244ce3f8c6c6428 | |
parent | e6d0a0ea72bc982ac294d64764efa4f1d6da0e66 (diff) | |
download | chef-ac270ac158e8fa5f26e94654158902cea8273166.tar.gz |
Fix rubygems provider to use https instead of http.
-rw-r--r-- | CONTRIBUTING.md | 2 | ||||
-rw-r--r-- | lib/chef/provider/package/rubygems.rb | 2 | ||||
-rw-r--r-- | spec/unit/provider/package/rubygems_spec.rb | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f8618ad381..8c19e1011a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -173,7 +173,7 @@ Contributions go through a review process to improve code quality and avoid regr Our primary shipping vehicle is operating system specific packages that includes all the requirements of Chef. We call these [Omnibus packages](https://github.com/opscode/omnibus-ruby) -We also release our software as gems to [Rubygems](http://rubygems.org/) but we strongly +We also release our software as gems to [Rubygems](https://rubygems.org/) but we strongly recommend using Chef packages since they are the only combination of native libraries & gems required by Chef that we test throughly. diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb index 3c0ca40693..6304a7ef63 100644 --- a/lib/chef/provider/package/rubygems.rb +++ b/lib/chef/provider/package/rubygems.rb @@ -534,7 +534,7 @@ class Chef if @new_resource.source =~ /\.gem$/i name = @new_resource.source else - src = @new_resource.source && " --source=#{@new_resource.source} --source=http://rubygems.org" + src = @new_resource.source && " --source=#{@new_resource.source} --source=https://rubygems.org" end if version shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}#{opts}", :env=>nil) diff --git a/spec/unit/provider/package/rubygems_spec.rb b/spec/unit/provider/package/rubygems_spec.rb index db1c21090d..a3a4772229 100644 --- a/spec/unit/provider/package/rubygems_spec.rb +++ b/spec/unit/provider/package/rubygems_spec.rb @@ -90,7 +90,7 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do dep = Gem::Dependency.new('rspec', '>= 0') dep_installer = Gem::DependencyInstaller.new allow(@gem_env).to receive(:dependency_installer).and_return(dep_installer) - latest = [[gemspec("rspec", Gem::Version.new("1.3.0")), "http://rubygems.org/"]] + latest = [[gemspec("rspec", Gem::Version.new("1.3.0")), "https://rubygems.org/"]] expect(dep_installer).to receive(:find_gems_with_sources).with(dep).and_return(latest) expect(@gem_env.candidate_version_from_remote(Gem::Dependency.new('rspec', '>= 0'))).to eq(Gem::Version.new('1.3.0')) end @@ -156,7 +156,7 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do it "finds a matching gem from a specific gemserver when explicit sources are given" do dep = Gem::Dependency.new('rspec', '>= 0') - latest = [[gemspec("rspec", Gem::Version.new("1.3.0")), "http://rubygems.org/"]] + latest = [[gemspec("rspec", Gem::Version.new("1.3.0")), "https://rubygems.org/"]] expect(@gem_env).to receive(:with_gem_sources).with('http://gems.example.com').and_yield dep_installer = Gem::DependencyInstaller.new @@ -291,9 +291,9 @@ RubyGems Environment: - "install" => "--env-shebang" - "update" => "--env-shebang" - "gem" => "--no-rdoc --no-ri" - - :sources => ["http://rubygems.org/", "http://gems.github.com/"] + - :sources => ["https://rubygems.org/", "http://gems.github.com/"] - REMOTE SOURCES: - - http://rubygems.org/ + - https://rubygems.org/ - http://gems.github.com/ JRUBY_GEM_ENV expect(@gem_env).to receive(:shell_out!).with('/usr/weird/bin/gem env').and_return(double('jruby_gem_env', :stdout => gem_env_out)) @@ -332,10 +332,10 @@ RubyGems Environment: - :benchmark => false - :backtrace => false - :bulk_threshold => 1000 - - :sources => ["http://rubygems.org/", "http://gems.github.com/"] + - :sources => ["https://rubygems.org/", "http://gems.github.com/"] - "gem" => "--no-rdoc --no-ri" - REMOTE SOURCES: - - http://rubygems.org/ + - https://rubygems.org/ - http://gems.github.com/ RBX_GEM_ENV expect(@gem_env).to receive(:shell_out!).with('/usr/weird/bin/gem env').and_return(double('rbx_gem_env', :stdout => gem_env_out)) |