gem_comet 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57c1e8a6cd0cfce646e1f0e2308d6a29dea5c0f741763d7aa721b6d61f5c9c71
-  data.tar.gz: 6bcc4d93b64b5eabfb1e6b824a167a4b54a9dfeadcfacbdccdaa1d81568397ea
+  metadata.gz: ba30b799de346dffa5bd093cac66ea82e6797de2d7c8f443bebdc1e1be5d36da
+  data.tar.gz: 1c18e9ec7f1dcbc878c849e77dff5ef368dfc4d8fd40b34f29549d56719da9f3
 SHA512:
-  metadata.gz: e0db304325a3cdf022c961ffbc24728e1cdd606974de62ed93a64676e95e3b99069e2c76d0ba67476a52f8c6a8614ed4e7be3bf67d08cf551b593fd39764a6fd
-  data.tar.gz: 36a24509001aed657bed2976b4134f6a8155e5bffa9e251b8af555fb742a26b28600642d02138cf7d047dff70c90586fcbbe347b91d703e4a79daa9f94f28255
+  metadata.gz: fcec552a4d36dc03e55172388c8461f03d41402a6be3c2076dd864c51763b7af0b882165d0bd102ad7e9e2538954ede67d7836609812ccb561baeb06d0ed8ada
+  data.tar.gz: cb728564444d6b938be9eb02b959c13f4f108df3de9b295d2c8f173aaa762fe0545edb99404478e2e5c62bea57ef647ec0be880a1e04c3b1417b006723f9417a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## v0.6.0 (Nov 03, 2019)
+
+### Feature
+
+* [#60](https://github.com/ryz310/gem_comet/pull/60) Verify git condition on release ([@ryz310](https://github.com/ryz310))
+
 ## v0.5.0 (Nov 02, 2019)
 
 ### Feature

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gem_comet (0.5.0)
+    gem_comet (0.6.0)
       pr_comet (~> 0.3.1)
       thor
       type_struct

data/lib/gem_comet/git_command.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module GemComet
+  # Executes git command
+  class GitCommand
+    def initialize; end
+
+    # Get uncommitted files
+    #
+    # @return [Array<String>] Uncommitted files
+    def uncommitted_files
+      git_status_short.lines.map(&:chomp)
+    end
+
+    # Get current git branch name
+    #
+    # @return [String] The current branch name
+    def current_branch
+      run 'rev-parse', '--abbrev-ref', 'HEAD'
+    end
+
+    def checkout(branch)
+      run 'checkout', branch
+    end
+
+    # Executes `$ git pull`
+    def pull
+      run 'pull'
+    end
+
+    private
+
+    def execute(command)
+      `#{command}`.chomp
+    end
+
+    def run(*subcommands)
+      command = "git #{subcommands.join(' ')}"
+      execute(command)
+    end
+
+    def git_status_short
+      run 'status', '--short'
+    end
+  end
+end

data/lib/gem_comet/release.rb

@@ -15,6 +15,7 @@ module GemComet
     attr_reader :version, :config
 
     def call
+      VerifyGitCondition.call
       UpdatePR.call(update_pr_args)
       ReleasePR.call(release_pr_args)
       OpenGithubPullsPage.call

data/lib/gem_comet/verify_git_condition.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module GemComet
+  # Verifies current git branch condition
+  class VerifyGitCondition < ServiceAbstract
+    def initialize
+      @base_branch = Config.call.release.base_branch
+      @git_command = GitCommand.new
+    end
+
+    private
+
+    attr_reader :base_branch, :git_command
+
+    def call
+      verify_git_status
+      checkout_to_base_branch!
+      git_pull!
+    end
+
+    # Verifies that there are not uncommitted files
+    #
+    # @raise [RuntimeError] Exists uncommitted files
+    def verify_git_status
+      uncommitted_files = git_command.uncommitted_files
+      return if uncommitted_files.empty?
+
+      raise "There are uncommitted files:\n#{uncommitted_files.join("\n")}"
+    end
+
+    # Checkout to the base branch
+    def checkout_to_base_branch!
+      current_branch = git_command.current_branch
+      return if base_branch == current_branch
+
+      puts "Current branch is expected to '#{base_branch}', but '#{current_branch}'."
+      puts "Checkout to '#{base_branch}'."
+      git_command.checkout(base_branch)
+    end
+
+    def git_pull!
+      git_command.pull
+    end
+  end
+end

data/lib/gem_comet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GemComet
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/lib/gem_comet.rb

@@ -8,6 +8,7 @@ require 'yaml'
 require 'gem_comet/version'
 require 'gem_comet/service_abstract'
 require 'gem_comet/config'
+require 'gem_comet/git_command'
 require 'gem_comet/bundle_updater'
 require 'gem_comet/version_editor'
 require 'gem_comet/version_history'
@@ -20,4 +21,5 @@ require 'gem_comet/repository_url'
 require 'gem_comet/release'
 require 'gem_comet/release/update_pr'
 require 'gem_comet/release/release_pr'
+require 'gem_comet/verify_git_condition'
 require 'gem_comet/cli'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem_comet
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - ryz310
@@ -226,12 +226,14 @@ files:
 - lib/gem_comet/changelog/initializer.rb
 - lib/gem_comet/cli.rb
 - lib/gem_comet/config.rb
+- lib/gem_comet/git_command.rb
 - lib/gem_comet/open_github_pulls_page.rb
 - lib/gem_comet/release.rb
 - lib/gem_comet/release/release_pr.rb
 - lib/gem_comet/release/update_pr.rb
 - lib/gem_comet/repository_url.rb
 - lib/gem_comet/service_abstract.rb
+- lib/gem_comet/verify_git_condition.rb
 - lib/gem_comet/version.rb
 - lib/gem_comet/version_editor.rb
 - lib/gem_comet/version_history.rb