hoe-bundler 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '0093e4cb1a127c8a4d151317f3e926268e0d931a'
-  data.tar.gz: 8366b6057d76601d1e276736a3c4346a654ab4e5
+SHA256:
+  metadata.gz: ad7f33d9a715e7cd7cdd3ee4394c74c3b36d43204fa80551cd802d65d8b1808b
+  data.tar.gz: b1f26c8bd13434c9f9d32d421fcb2288c348f8b7d5481a5f636ab6d540e11b9f
 SHA512:
-  metadata.gz: 1cdf2091038c60cb73c8a0eff6d5afe7206bb8e7a14dcce8d33655a2be0efa46c575b07b7b800686b070028ff1d244e2dd10e33d5a715ed00eb510f7aac26faf
-  data.tar.gz: 1c904d7f0a87c2ff17db67bcae7938cd29a1b58878951e808eeff2c6765083c0c793fdea74c9746a48b9dc7a007aa8a1f6e4849898c9e2b553ee29517dd885cb
+  metadata.gz: 3a6ca9420fef5a70b5b4cab026fe8dd89bd3efad21b115d81054edee1ab22a9404ff2306c99b914c02ee8916f9d87190cba4092719b2102fbd98aca3e72361de
+  data.tar.gz: '058c4d7c6d8dd01c877748fd766e0e51dd24aaa5240aa8bbae32ed71c905d58943b8119dd0c68e0ccd31262377e9580854685ef68c1c15dbed61a5ee8604cbe0'

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.5.0 / 2018-11-17
+
+Enhancements:
+
+* The `bundler:gemfile` rake task accepts optional arguments to specify the gem source, and whether to invoke `gemspec`. (Thanks, @adangel!)
+
+
 ## 1.4.0 / 2018-03-28
 
 Enhancements:

data/README.md

@@ -2,7 +2,7 @@
 
 http://github.com/flavorjones/hoe-bundler
 
-[![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/hoe-bundler/jobs/ruby-2.5/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/hoe-bundler)
+[![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/hoe-bundler/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/hoe-bundler)
 
 
 ## Description
@@ -14,7 +14,7 @@ Generate a Gemfile based on a Hoe spec's declared dependencies.
 
 Creates a rake task to generate a bundler Gemfile based on your declared hoe dependencies.
 
-* `bundler:gemfile`
+* `rake bundler:gemfile`
 
 Why would you want to do this? I mean, why would anyone want to use bundler to test their gem?
 
@@ -33,6 +33,25 @@ And then run the following command to generate a Gemfile:
     rake bundler:gemfile
 
 
+### Reference a gemspec file
+
+To generate a Gemfile which uses `gemspec` and the default source:
+
+    rake bundler:gemfile[,true]
+
+### Use a custom gem source
+
+To generate a Gemfile which uses a custom source:
+
+    rake bundler:gemfile[https://gems.github.com]
+
+### Reference a gemspec file and use a custom gem source
+
+Or the combination of custom source and gemspec:
+
+    rake bundler:gemfile[https://gems.github.com,true]
+
+
 ## Requirements
 
 * hoe >= 2.2.0

data/lib/hoe/bundler.rb

@@ -3,30 +3,42 @@ class Hoe #:nodoc:
   #  Rake task to generate a bundler Gemfile based on your declared hoe dependencies.
   #
   #  * <tt>bundler:gemfile</tt>
+  #  * <tt>bundler:gemfile[https://rubygems.org/,false]</tt>
   #
   module Bundler
-    VERSION = "1.4.0" #:nodoc:
+    VERSION = "1.5.0" #:nodoc:
+
+    DEFAULT_SOURCE = 'https://rubygems.org/'
+    DEFAULT_USE_GEMSPEC = false
 
     def define_bundler_tasks
       desc "generate a bundler Gemfile from your Hoe.spec dependencies"
-      task "bundler:gemfile" do
+      task "bundler:gemfile", :source, :use_gemspec do |t,args|
+        args.with_defaults(:source => DEFAULT_SOURCE, :use_gemspec => DEFAULT_USE_GEMSPEC)
         File.open("Gemfile","w") do |gemfile|
-          gemfile.print hoe_bundler_contents
+          gemfile.print hoe_bundler_contents(args)
         end
       end
     end
 
-    def hoe_bundler_contents
+    def hoe_bundler_contents(args = {})
+      args[:source] = DEFAULT_SOURCE unless args.has_key?(:source)
+      args[:use_gemspec] = DEFAULT_USE_GEMSPEC unless args.has_key?(:use_gemspec)
+
       gemfile = StringIO.new
       gemfile.puts "# -*- ruby -*-"
       gemfile.puts
       gemfile.puts "# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`."
       gemfile.puts
-      gemfile.puts "source \"https://rubygems.org/\""
+      gemfile.puts "source "<< ((args[:source] =~ /^https?:\/\//) ? "\"#{args[:source]}\"" : ":#{args[:source]}")
+      gemfile.puts "gemspec" if args[:use_gemspec]
       gemfile.puts
 
-      hoe_bundler_add_dependencies(self.extra_deps, gemfile)
-      hoe_bundler_add_dependencies(self.extra_dev_deps, gemfile, ", :group => [:development, :test]")
+      unless args[:use_gemspec]
+        hoe_bundler_add_dependencies(self.extra_deps, gemfile)
+        hoe_bundler_add_dependencies(self.extra_dev_deps, gemfile, ", :group => [:development, :test]")
+      end
+
       gemfile.puts "# vim: syntax=ruby"
 
       gemfile.rewind

data/test/test_hoe_bundler.rb

@@ -5,6 +5,10 @@ require "hoe"
 Hoe.plugin :bundler
 
 class TestHoeBundler < Minitest::Test
+  def teardown
+    system "git checkout -f test/fixture_project/Gemfile"
+  end
+
   def test_output
     gemfile = nil
     Dir.chdir(File.join(File.dirname(__FILE__), "fixture_project")) do
@@ -61,4 +65,93 @@ class TestHoeBundler < Minitest::Test
       assert_equal %Q{gem "bar", ">=1.8", "<3.0", :group => [:development, :test]}, lines.grep(/bar/).first
     end
   end
+
+  def test_source_symbol_option
+    gemfile = nil
+    Dir.chdir(File.join(File.dirname(__FILE__), "fixture_project")) do
+      FileUtils.rm_f "Gemfile"
+      begin
+        system "rake bundler:gemfile[gemcutter]"
+        gemfile = File.read "Gemfile"
+      end
+    end
+    assert_match %r{^source \:gemcutter$}, gemfile
+  end
+
+  def test_source_http_option
+    gemfile = nil
+    Dir.chdir(File.join(File.dirname(__FILE__), "fixture_project")) do
+      FileUtils.rm_f "Gemfile"
+      begin
+        system "rake bundler:gemfile[http://gems.github.com]"
+        gemfile = File.read "Gemfile"
+      end
+    end
+    assert_match %r{^source "http:\/\/gems\.github\.com"$}, gemfile
+  end
+
+  def test_source_https_option
+    gemfile = nil
+    Dir.chdir(File.join(File.dirname(__FILE__), "fixture_project")) do
+      FileUtils.rm_f "Gemfile"
+      begin
+        system "rake bundler:gemfile[https://gems.github.com]"
+        gemfile = File.read "Gemfile"
+      end
+    end
+    assert_match %r{^source "https:\/\/gems\.github\.com"$}, gemfile
+  end
+
+  def test_gemspec_option
+    gemfile = nil
+    Dir.chdir(File.join(File.dirname(__FILE__), "fixture_project")) do
+      FileUtils.rm_f "Gemfile"
+      begin
+        system "rake bundler:gemfile[rubygems,true]"
+        gemfile = File.read "Gemfile"
+      end
+    end
+    assert_match %r{^# -\*- ruby -\*-$}, gemfile
+    assert_match %r{^# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.}, gemfile
+    assert_match %r{^source \:rubygems$}, gemfile
+    assert_match %r{^gemspec$}, gemfile
+    assert_match %r{^# vim: syntax=ruby$}, gemfile
+
+    lines = gemfile.split("\n")
+    # normal gem declarations should not be there if gemspec is used
+    assert_equal 0, lines.grep(/gem \"/).length
+  end
+
+  def test_just_gemspec_option
+    gemfile = nil
+    Dir.chdir(File.join(File.dirname(__FILE__), "fixture_project")) do
+      FileUtils.rm_f "Gemfile"
+      begin
+        system "rake bundler:gemfile[,true]"
+        gemfile = File.read "Gemfile"
+      end
+    end
+    assert_match %r{^# -\*- ruby -\*-$}, gemfile
+    assert_match %r{^# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.}, gemfile
+    assert_match %r{^source "https:\/\/rubygems.org\/"$}, gemfile
+    assert_match %r{^gemspec$}, gemfile
+    assert_match %r{^# vim: syntax=ruby$}, gemfile
+
+    lines = gemfile.split("\n")
+    # normal gem declarations should not be there if gemspec is used
+    assert_equal 0, lines.grep(/gem \"/).length
+  end
+
+  def test_source_http_and_gemspec_option
+    gemfile = nil
+    Dir.chdir(File.join(File.dirname(__FILE__), "fixture_project")) do
+      FileUtils.rm_f "Gemfile"
+      begin
+        system "rake bundler:gemfile[http://gems.github.com,true]"
+        gemfile = File.read "Gemfile"
+      end
+    end
+    assert_match %r{^source "http:\/\/gems\.github\.com"$}, gemfile
+    assert_match %r{^gemspec$}, gemfile
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoe-bundler
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Mike Dalessio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Generate a Gemfile based on a Hoe spec's declared dependencies.