juwelier 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ddcd31ad89706d0a9a116f06ac6acdc20c1a933
-  data.tar.gz: d9e9ecf5e8bbb75656de4b6845b040252f81960e
+  metadata.gz: 6c8879502d283b92e5f3cdcef8120a242254c0b1
+  data.tar.gz: 1d31e2ea36636578a10d962279e1582d2fd4097c
 SHA512:
-  metadata.gz: 8ef8e80a3206f437568222a82125994826754f3bcb52253f289f7166e062ca15cee59eafc081030203c1126029a8afa33ed1af666af2e5fb9ff27deac732b604
-  data.tar.gz: 4d0cc1f08d6ddd214280f35269898ae1b9a23e9ba23cd2d861eadf7e4fa365df644fe49037209c91c621eb8f95386c0c77b4539e36e512b6afb39117fd12cef8
+  metadata.gz: 34a8c52873c04de22e072e803fba7e1737389e37c32e22f0bd506fefea80d737917d1236ccf81fa2dd3642a2e1314bf66013ad2c364ab690f0095c67044c73d4
+  data.tar.gz: 45650272fdb367245558a4a5b5496ab508486c3da89e602dd568258d87f14b0d1f5644725aff4a851aeabbae41788e91b91b13b6e93626516340efb116e0fb27

data/.semver

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 1
-:patch: 2
+:patch: 3
 :special: ''

data/ChangeLog.markdown

@@ -1,3 +1,7 @@
+# juwelier 2.1.3, 2016-10-22
+  * Forward ported patches from Jewler 2.1.2
+  * Updated dependencies
+
 # juwelier 2.1.0, 2016-02-06
 
  * Forked from the unmaintained Jeweler

data/Gemfile

@@ -5,7 +5,7 @@ gem "git", ">= 1.2.5"
 gem "nokogiri", ">= 1.5.10"
 gem "github_api"
 gem "highline", ">= 1.6.15"
-gem "bundler", ">= 1.0"
+gem "bundler", ">= 1.13"
 gem "rdoc"
 gem "builder"
 gem "semver"
@@ -29,13 +29,6 @@ group :test do
   gem 'coveralls', :require => false
 end
 
-# yo dawg, i herd u lieked juwelier
-group :xzibit do
-  # steal a page from bundler's gemspec:
-  # add this directory as juwelier, in order to bundle exec juwelier and use the current working directory
-  gem 'juwelier', :path => '.'
-end
-
 group :debug do
   gem 'test-unit'
 end

data/Rakefile

@@ -17,6 +17,7 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
 require 'juwelier'
 
 Juwelier::Tasks.new do |gem|

data/juwelier.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: juwelier 2.1.2 ruby lib
+# stub: juwelier 2.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "juwelier"
-  s.version = "2.1.2"
+  s.version = "2.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Fred Mitchell", "Josh Nichols", "Yusuke Murata"]
-  s.date = "2016-05-29"
+  s.date = "2016-10-22"
   s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
   s.email = ["fred.mitchell@gmx.de", "fred.mitchell@gmx.com", "info@muratayusuke.com"]
   s.executables = ["juwelier"]
@@ -200,7 +200,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.5.10"])
       s.add_runtime_dependency(%q<github_api>, [">= 0"])
       s.add_runtime_dependency(%q<highline>, [">= 1.6.15"])
-      s.add_runtime_dependency(%q<bundler>, [">= 1.0"])
+      s.add_runtime_dependency(%q<bundler>, [">= 1.13"])
       s.add_runtime_dependency(%q<rdoc>, [">= 0"])
       s.add_runtime_dependency(%q<builder>, [">= 0"])
       s.add_runtime_dependency(%q<semver>, [">= 0"])
@@ -214,7 +214,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nokogiri>, [">= 1.5.10"])
       s.add_dependency(%q<github_api>, [">= 0"])
       s.add_dependency(%q<highline>, [">= 1.6.15"])
-      s.add_dependency(%q<bundler>, [">= 1.0"])
+      s.add_dependency(%q<bundler>, [">= 1.13"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<semver>, [">= 0"])
@@ -229,7 +229,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, [">= 1.5.10"])
     s.add_dependency(%q<github_api>, [">= 0"])
     s.add_dependency(%q<highline>, [">= 1.6.15"])
-    s.add_dependency(%q<bundler>, [">= 1.0"])
+    s.add_dependency(%q<bundler>, [">= 1.13"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<semver>, [">= 0"])

data/lib/juwelier/specification.rb

@@ -69,12 +69,12 @@ class Juwelier
 
         if File.exist?('Gemfile')
           require 'bundler'
-          bundler = Bundler.load
-          bundler.dependencies_for(:default, :runtime).each do |dependency|
-            self.add_dependency dependency.name, *dependency.requirement.as_list
+          bundler_runtime = Bundler.load
+          bundler_dependencies_for(bundler_runtime, :default, :runtime).each do |dependency|
+            add_dependency dependency.name, *dependency.requirement.as_list
           end
-          bundler.dependencies_for(:development).each do |dependency|
-            self.add_development_dependency dependency.name, *dependency.requirement.as_list
+          bundler_dependencies_for(bundler_runtime, :development).each do |dependency|
+            add_development_dependency dependency.name, *dependency.requirement.as_list
           end
         end
         
@@ -89,8 +89,20 @@ class Juwelier
       end
     end
 
-  private
-
+    private
+    
+    # Backported (or rather forward-ported) from Bunder::Runtime#dependencies_for.
+    # This method was available until Bundler 1.13, and then removed. We need it
+    # to be able to tell which gems are listed in the Gemfile without loading
+    # those gems first.
+    def bundler_dependencies_for(bundler_runtime, *groups)
+      if groups.empty?
+        bundler_runtime.dependencies
+      else
+        bundler_runtime.dependencies.select {|d| (groups & d.groups).any? }
+      end
+    end
+    
     def blank?(value)
       value.nil? || value.empty?
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: juwelier
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Fred Mitchell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement