everyleaf-embulk_helper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47199c2195e7f7c5eaa82fcb8bc724b9d8cb6b81
-  data.tar.gz: 36e4cef37bfec31361c210c996cae6631d4e38b7
+  metadata.gz: 36c1b41d191cb714c8d3b420d287402632ebb34c
+  data.tar.gz: 122aa4c29658a038ae0b9d71288c41cf660ce42a
 SHA512:
-  metadata.gz: bcccc09f44218259902ef6f47cc435f22e62060e8c988b997715bc4b889eb27e28ec050de016062686e8283d96c549aa5c1e268e52db5c109dc78d81dc420da6
-  data.tar.gz: 6ea9fb9a61bc3365e851021506a450610c63a350fe7f593e7ab78a8ff85ae7ddcab865bebc9b1350c16e1ff764c73253f8276ccb0d6e3e06b619c7e554ed8d69
+  metadata.gz: 90060c26bf3d014428599c451bd29c1810653d85d589979335e818d6c95316267e9a278c18a5db907a5b8e4123e33b43bef82d5173adaf7c8522317ffbb6ebf2
+  data.tar.gz: 7362b8bc99f5046a4d8e77cf8c840d07c200c402ea236e008658bbfec3abf492c79903021ce36cdae703263404cfc784edb282017b61162338a76c2a3f07f063

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.2 - 2015-08-11
+
+* [fix] Fix gemspec path within generated gemfile template [#2](https://github.com/everyleaf/everyleaf-embulk_helper/pull/2)
+* [improve] generage:changelog can accept `CURRENT_VER` and `NEXT_VER` environment variable instead of auto detection
+
 ## 0.0.1 - 2015-08-11
 
 The first release!!

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    everyleaf-embulk_helper (0.0.1)
+    everyleaf-embulk_helper (0.0.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/everyleaf/embulk_helper/tasks/generator/changelog.rb

@@ -50,10 +50,11 @@ module Everyleaf
           end
 
           def current_version
-            Gem::Version.new(gemspec_path.read[/spec\.version += *"([0-9]+\.[0-9]+\.[0-9]+)"/, 1])
+            ENV["CURRENT_VER"] || Gem::Version.new(gemspec_path.read[/spec\.version += *"([0-9]+\.[0-9]+\.[0-9]+)"/, 1])
           end
 
           def next_version
+            return ENV["NEXT_VER"] if ENV["NEXT_VER"]
             major, minor, patch = current_version.segments
             ver = case version_target
             when "patch"
@@ -81,7 +82,7 @@ module Everyleaf
 
           def pull_request_numbers
             sync_git_repo
-            `git log v#{old_version}..origin/master --oneline`.scan(/#[0-9]+/).map do |num_with_hash|
+            `git log v#{current_version}..origin/master --oneline`.scan(/#[0-9]+/).map do |num_with_hash|
               num_with_hash[/[0-9]+/]
             end
           end

data/lib/everyleaf/embulk_helper/tasks/generator/gemfiles.rb

@@ -40,7 +40,7 @@ module Everyleaf
           def initial_template
             <<-ERB
 source 'https://rubygems.org/'
-gemspec :path => '#{File.dirname(gemspec_path)}'
+gemspec :path => '#{gemspec_path.dirname.relative_path_from(gemfiles_dir)}/'
 
 gem "embulk", "<%= version %>"
             ERB

data/lib/everyleaf/embulk_helper/version.rb

@@ -1,5 +1,5 @@
 module Everyleaf
   module EmbulkHelper
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/test/everyleaf/embulk_helper/tasks/generator/test_gemfiles.rb

@@ -66,6 +66,49 @@ gem "embulk", "0.1.2"
             end
           end
 
+          class TestInitialContent < self
+            def setup
+              FileUtils.mkdir_p root
+              FileUtils.touch gemspec_path
+
+              task = Gemfiles.new(options.merge({
+                github_name: "dummy/dummy",
+                gemspec: gemspec_path,
+                gemfile_template_path: gemfile_template_path,
+              }))
+              mute_logger(task)
+              task.send(:init)
+            end
+
+            def teardown
+              FileUtils.rm_rf root
+            end
+
+            def test_relative_path
+              content = File.read(gemfile_template_path)
+              assert content.include?("path => '../'") # the gemspec path from each gemfiles/* as relative
+            end
+
+            def test_embulk_version_contain
+              content = File.read(gemfile_template_path)
+              assert content.include?(%Q|gem "embulk", "<%= version %>"|)
+            end
+
+            private
+
+            def gemfile_template_path
+              root.join("gemfiles/template.erb")
+            end
+
+            def root
+              Pathname.new("/tmp/foo")
+            end
+
+            def gemspec_path
+              root.join("bar.spec")
+            end
+          end
+
           def test_task_installed
             Everyleaf::EmbulkHelper::Tasks.install(options)
             gemfiles_task = Rake::Task.tasks.find do |task|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: everyleaf-embulk_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - yoshihara