gem_release_helper 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff13664fd883a8f84e71ec0735526b42b793bcf4
-  data.tar.gz: eb4114d0735073d28de2438235da86066904e7a6
+  metadata.gz: 8d119030846dc267a66ee8153fd37e9a18938737
+  data.tar.gz: dfbe0a6a700237dd2ad36a4aec54ea10c5a2893e
 SHA512:
-  metadata.gz: 71d66bda16d7bd8be453add1f839d43c1ca558b8cfdd4ec6aa503f10963f75e23a4d5cb328aecd97292149e9844f7c4108d530cc7055cd02e65a11855d394d83
-  data.tar.gz: 96f1b74f48d782753241667cf6ccadbbd4c935e76a7d6b0644d905b1ff3d1ab632440f38d8473aced2570360a2e4064a9453d84b49c0605151074412a206627f
+  metadata.gz: b7745d262ae469d4ad66e9edabe4f4e00e72016ec6059e92313cd2704d3b9393798b64caee4fd7c2b887bd2e2d029e574989d6deb10465f37fa9065398c02ed1
+  data.tar.gz: 13747b0e86029980968bd3a2ff49ea8a2ac523ff172640695f43c9ba4d35a05647a6e2ba71e669f03ce5299a188c88bb800cb42c7639112f9ebe953fa467a1d6

data/.gitignore

@@ -0,0 +1,2 @@
+/pkg/
+/Gemfile.lock

data/.travis.yml

@@ -1,14 +1,16 @@
 language: ruby
 rvm:
-  - jruby-19mode
-  - jruby-9.0.0.0 # NOTE: rvm 1.26.10 recognize as jruby-9.0.0pre1
+  - jruby-9.0.5.0 # NOTE: rvm 1.26.10 recognize as jruby-9.0.0pre1
+  - 2.3.1
+  - ruby-head
+  - jruby-head
 env: 'JRUBY_OPTS="-Xcli.debug=true --debug"' # for test coverage
+
 addons:
   code_climate:
-    repo_token:
-      secure: "Ael9qV6oxuruF2I4l5GVm85EXmsTFJB2AxcwT3Ni2fALj+/xUdR5n9FwPxLwTqSFhLmr/ccefOIyqMDCo9LNcDc8ib7ypYHsTbNu8vZHlM5mbDA4/N5fpvahpAd532XCxOg4B90oOIbVlyalPGmO4mhCDTr17GnvPXgOfdf2zzq7xRL3gUjP7MGGLCCXhvuu6/D6+YhKCHUGymeaxFUxUeTI0h8Uempl7fhqcOyJlgMB+m7iK4Owy6sX6DWHzcYBbnWXUw0Czy47JrZHbN3YseURDpe6WTXL9eC42wo2LhMnqQH9fkMNpKRN80XE0P636ckI4nwmsPjAkV4/Q8X4oXE1Q8Muuei9ZHFV8k26GY0aaJ+zEo5ajfBXZPBQcFrhYzUuWpSym0JBCr0lEywr1DVLl1Qf/2+9782JCs8Bjvq3qTMY4AB45OqpLBScRbx0WoK03yuHLNtHLc9IftCQolxb0Wi08Q48NJmg4nsBcSaaJKlry/yr/vZ5kdKZJG8hWQfMUUjE1WP4l3gr1l2tP46s62t3B4cLcZ8wCEjzHNFKc30AfomfmABGV8M9LdRaYaNkLBaHhQVzlGJB32WDZWU5xClYDy2K6PjuXWp1BY4JcMWRkS9vAyezwRxvkXzX68DUerpUpk6+XensYcjgdOY60EYcY7FIiSm91hzB6l0="
-notifications:
-  slack:
-    secure: DWXP4y5GvW5EyuZbcpXH3pnbb4lycfQ3SnxFUErjNnZacKRXLf1r93D5nT9GFvDERU7T3LIm8qwei6h3O5YNQDU1TKOhpWrGgkVYh0/VsyJhVeKSAErurmuMrBaloZ3pfszaTIK+v/WFj8E+25w1QLJaNoQ5aMCsq0r+ipuW/nDwX9HFAuLshjSy0ALmHmdha67iTZidfMLW8JbaAf1BnbmqHjFI2QuzSU01Yl2hOdY8k4JBpVtR5ntQJEaBVd+O07oNiY+GdETAD2n7jViJInjTz2Oy5c6j1ijcIknnzzlufFA7+fBmzXYQlcVOJE//DpfdAjYxlm6qKIoTKlI8JRbfX2e94qGsaLAi4OrDIdChlp+oF1Id3VDPnf3ckz1s5b+tbBtjbu5FO2+i6GvimQPysj3af2RvUZ9UkzQEgOxy+sT9STNm8Aa/2zg+TgKHvZ2E89YmMO57k/pac/Bn1BiAkActKu/gZdun6l4PC7/0qUbEI/ndnNMbpKx5gOgmpiIWkTAMo6oDbigygUwduonsoKx0oT9rm8q1AQA6PrxORj7+5cd6kmEaPvSvZS4oiSVwJvgs4RLp65grG6TxmHDzBizbJlEveDvZ9sgG9wgH7/ihtqKVG1KxXycierEJUoYvN0IUDKYQWMzzNKl5rSw58lHDEu606U15gUk5mXY=
+    repo_token: 089cf6093822f5c0502918a9590ce8284f352501199ae0261c7cef4357a418c8
 jdk:
-- oraclejdk8
+  - oraclejdk8
+
+before_install:
+  - gem i bundler

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.1 - 2016-07-22
+* [improve] Enable to detect/bump version using external file [#2](https://github.com/uu59/gem_release_helper/pull/2)
+* [improve] Enable to access private repo [#1](https://github.com/uu59/gem_release_helper/pull/1)
+
 ## 1.0.0 - 2016-07-13
 
 Forked and renamed as "gem_release_helper".

data/README.md

@@ -27,6 +27,11 @@ Load rake tasks at your Rakefile:
 
     require "bundler/gem_tasks"
     require "gem_release_helper/tasks"
+    GemReleaseHelper::Tasks.install({
+      gemspec: "./your_gem.gemspec",
+      github_name: "user/repo", # if this repo is private, you can access it by set GITHUB_OAUTH_TOKEN to environment variable
+    })
+
 
 ## Usage
 
@@ -34,6 +39,7 @@ Load rake tasks at your Rakefile:
     rake build                     # Build embulk-input-your-plugin-0.1.0.gem into the pkg directory
     rake generate:bump_version     # Bump version
     rake generate:changelog        # Generate CHANGELOG.md from previous release
+    rake generate:gemfiles         # Generate gemfiles to test this plugin with released Embulk versions (since MIN_VERSION)
     rake generate:prepare_release  # Generate chengelog then bump version
     rake install                   # Build and install embulk-input-your-plugin-0.1.0.gem into system gems
     rake release                   # Create tag v0.1.0 and build and push embulk-input-your-plugin-0.1.0.gem to Rubygems

data/lib/gem_release_helper/tasks/generator/changelog.rb

@@ -1,4 +1,5 @@
 require "gem_release_helper/tasks/common"
+require "open3"
 
 module GemReleaseHelper
   module Tasks
@@ -34,7 +35,18 @@ module GemReleaseHelper
         end
 
         def bump_version
-          logger.info "Version bump '#{current_version}' to '#{next_version}'"
+          logger.info "Bump version from '#{current_version}' to '#{next_version}'"
+          case where_written_version
+          when :gemspec
+            write_new_version_to_gemspec
+          when :version_file
+            write_new_version_to_version_file
+          end
+        end
+
+        private
+
+        def write_new_version_to_gemspec
           old_content = gemspec_path.read
           new_content = old_content.gsub(/(spec\.version += *)".*?"/, %Q!\\1"#{next_version}"!)
           File.open(gemspec_path, "w") do |f|
@@ -42,14 +54,47 @@ module GemReleaseHelper
           end
         end
 
-        private
+        def write_new_version_to_version_file
+          version_file = version_files.first
+          new_content = File.read(version_file).gsub(current_version.to_s, next_version.to_s)
+          File.open(version_file, "w") {|f| f.write new_content }
+        end
+
+        def where_written_version
+          if gemspec_path.read.include?(current_version.to_s)
+            :gemspec
+          else
+            version_file = version_files.first
+            if version_file && File.read(version_file).include?(current_version.to_s)
+              return :version_file
+            end
+            raise "Couldn't find where is version written"
+          end
+        end
+
+        def version_files
+          Dir["#{gemspec_path.dirname}/**/version**"]
+        end
 
         def required_options
           %w(github_name)
         end
 
         def current_version
-          ENV["CURRENT_VER"] || Gem::Version.new(gemspec_path.read[/spec\.version += *"([0-9]+\.[0-9]+\.[0-9]+)"/, 1])
+          return ENV["CURRENT_VER"] if ENV["CURRENT_VER"]
+          ver = gemspec_path.read[/spec\.version += *"([0-9]+\.[0-9]+\.[0-9]+)"/, 1] ||
+            begin
+              # from rake
+              # https://github.com/ruby/rake/blob/1b27eb2f8234190bba0e973194d38bcf09443ec0/lib/rake/file_utils.rb
+              ruby = File.join(
+                RbConfig::CONFIG['bindir'],
+                RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT']
+              ).sub(/.*\s.*/m, '"\&"')
+              script = %Q!print eval(File.read('#{gemspec_path}')).version.to_s!
+              o, _, _ = Open3.capture3(ruby, "-e", script)
+              o.strip
+            end
+          Gem::Version.new(ver)
         end
 
         def next_version
@@ -87,7 +132,9 @@ module GemReleaseHelper
         end
 
         def pull_request_info(number)
-          body = open("https://api.github.com/repos/#{github_name}/issues/#{number}").read
+          body = open("https://api.github.com/repos/#{github_name}/issues/#{number}", {
+            "Authentication" => "token #{ENV["GITHUB_OAUTH_TOKEN"]}"
+          }).read
           JSON.parse(body)
         end
 

data/lib/gem_release_helper/version.rb

@@ -1,3 +1,3 @@
 module GemReleaseHelper
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/gem_release_helper/tasks/generator/test_changelog.rb

@@ -73,61 +73,110 @@ Merry Xmas!
         end
 
         class TestBumpVersion < self
-          def test_bump_version_task
-            any_instance_of(Changelog) do |klass|
-              mock(klass).bump_version
-              mock(klass).update_gemfile_lock
+          class TestVersionDynamic < self
+            def setup
+              @version = "1.0.0"
+              @dir = Pathname.new(Dir.tmpdir).join(Time.now.to_f.to_s)
+              @dir.mkdir
+              @version_file = @dir.join("lib/foo/version.rb")
+              FileUtils.mkdir_p @version_file.dirname
+              @version_file.write <<RUBY
+class Foo
+  VERSION = "#{@version}"
+end
+RUBY
+              @dir.join("foo.gemspec").write <<-SPEC
+# coding: utf-8
+require '#{@dir.join("lib/foo/version.rb").to_s}'
+
+Gem::Specification.new do |spec|
+  spec.name          = "foo"
+  spec.version       = Foo::VERSION
+end
+SPEC
+            end
+
+            def teardown
+              FileUtils.rm_rf @dir
+            end
+
+            def test_bump_version_on_file
+              @task = Changelog.new(options)
+              mute_logger(@task)
+
+              @task.bump_version
+              assert @version_file.read.include?("1.0.1")
+              assert_equal "1.0.1", @task.send(:current_version).to_s
+            end
+
+            private
+
+            def options
+              {
+                gemspec: @dir.join("foo.gemspec").to_s,
+                github_name: "foo/foo",
+              }
             end
-            Tasks.install(options)
-            task = Rake::Task.tasks.find {|task| task.name == "generate:bump_version"}
-            task.execute
-          ensure
-            Rake::Task.clear
           end
 
-          def test_without_option
-            @task = Changelog.new(options)
-            mute_logger(@task)
+          class TestVersionStatic < self
+            def test_bump_version_task
+              any_instance_of(Changelog) do |klass|
+                mock(klass).bump_version
+                mock(klass).update_gemfile_lock
+              end
+              Tasks.install(options)
+              task = Rake::Task.tasks.find {|t| t.name == "generate:bump_version"}
+              task.execute
+            ensure
+              Rake::Task.clear
+            end
 
-            @task.bump_version
+            def test_without_option
+              @task = Changelog.new(options)
+              mute_logger(@task)
 
-            assert_equal(<<-SPEC, gemspec_path.read)
+              @task.bump_version
+
+              assert_equal(<<-SPEC, gemspec_path.read)
 spec.version       = "0.1.3"
-            SPEC
-          end
+              SPEC
+            end
 
-          def test_with_patch
-            @task = Changelog.new(options.merge(version_target: "patch"))
-            mute_logger(@task)
+            def test_with_patch
+              @task = Changelog.new(options.merge(version_target: "patch"))
+              mute_logger(@task)
 
-            @task.bump_version
+              @task.bump_version
 
-            assert_equal(<<-SPEC, gemspec_path.read)
+              assert_equal(<<-SPEC, gemspec_path.read)
 spec.version       = "0.1.3"
-            SPEC
-          end
+              SPEC
+            end
 
-          def test_with_minor
-            @task = Changelog.new(options.merge(version_target: "minor"))
-            mute_logger(@task)
+            def test_with_minor
+              @task = Changelog.new(options.merge(version_target: "minor"))
+              mute_logger(@task)
 
-            @task.bump_version
+              @task.bump_version
 
-            assert_equal(<<-SPEC, gemspec_path.read)
+              assert_equal(<<-SPEC, gemspec_path.read)
 spec.version       = "0.2.0"
-            SPEC
-          end
+              SPEC
+            end
 
-          def test_with_major
-            @task = Changelog.new(options.merge(version_target: "major"))
-            mute_logger(@task)
+            def test_with_major
+              @task = Changelog.new(options.merge(version_target: "major"))
+              mute_logger(@task)
 
-            @task.bump_version
+              @task.bump_version
 
-            assert_equal(<<-SPEC, gemspec_path.read)
+              assert_equal(<<-SPEC, gemspec_path.read)
 spec.version       = "1.0.0"
-            SPEC
+              SPEC
+            end
           end
+
         end
 
         private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem_release_helper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - yoshihara
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,10 +103,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,57 +0,0 @@
-PATH
-  remote: .
-  specs:
-    gem_release_helper (1.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    codeclimate-test-reporter (0.4.7)
-      simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.0)
-    docile (1.1.5)
-    ffi (1.9.10-java)
-    json (1.8.3)
-    json (1.8.3-java)
-    method_source (0.8.2)
-    power_assert (0.2.3)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry (0.10.1-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    rake (10.4.2)
-    rr (1.1.2)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    spoon (0.0.4)
-      ffi
-    test-unit (3.1.2)
-      power_assert
-    test-unit-rr (1.0.3)
-      rr (>= 1.1.1)
-      test-unit (>= 2.5.2)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.7)
-  codeclimate-test-reporter
-  gem_release_helper!
-  pry
-  rake (~> 10.0)
-  test-unit
-  test-unit-rr
-
-BUNDLED WITH
-   1.12.5