gh_compare 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86877317391ee3415a229a9375e59a9e123a071920856f3ea5154d28fa3c86ba
-  data.tar.gz: 75f5e9d408a90459b5a67f03e436112d5871c60faef29dca712016786252c196
+  metadata.gz: b388008432820bed2c4b1a15356d3d891808bc7d1efcbd0fd5658aeac6e600bf
+  data.tar.gz: 6688c0cb19acb42a673f9d4c7f9155c27dd754f7b9521c8ce1a313e5a56a5139
 SHA512:
-  metadata.gz: '0493f939e0ce4ed7083e35238932d483eeb04c152c9c96b2c6c59a2ccbb2816d200c7496328ab58d22b40fa06f83d203d411f0530a39839b35193485723365bf'
-  data.tar.gz: ca56c90e1bd6523674b4a8e268478670258521ada18164a8e00437347b77878e85d80ebf8b67a061dcf75043b5a98c7987544d2f9a8997976fda9ae4e9e3c2a7
+  metadata.gz: 2f1c806fefef3966209608eb6d26adebe6b34178f1d46258bac72019d1b36892342a05c1b64db2bb49ec99dc0c06f85c41cc1bd6071f69f79a3f1b46af6cb7b6
+  data.tar.gz: 78746dde6a70d96f98dad153c1f67fd83cb3f7269800f08fb11d9c174413e150829573e80db3ef43866bf5f069f4e8c768b0cce0fa9800ca0358afc81010d250

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gh_compare (0.1.3)
+    gh_compare (0.1.4)
 
 GEM
   remote: https://rubygems.org/

data/bin/gh_compare

@@ -1,22 +1,4 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/gh_compare'
-require 'optparse'
-options = {}
-
-OptionParser.new do |opt|
-  opt.on('--n=NUM', Integer) { |v| options[:num] = v }
-  opt.on('--d==V,V', Array) { |v| options[:commits] = v }
-
-  opt.parse!(ARGV)
-end
-
-if options[:num]
-  compare = GhCompare::CommitCompare.new
-  puts compare.compare_before(options[:num])
-end
-
-if options[:commits]
-  compare = GhCompare::CommitCompare.new
-  puts compare.compare_url(options[:commits][0], options[:commits][1])
-end
+require_relative '../lib/gh_compare/exec/commit_compare'
+puts GhCompare::Exec::CommitCompare.new(ARGV).run

data/lib/gh_compare/commit_compare.rb

@@ -0,0 +1,45 @@
+require 'uri'
+
+module GhCompare
+  class CommitCompare
+    attr_reader :remote_origin
+
+    def initialize
+      @remote_origin = get_remote_origin
+    end
+
+    def remote_url
+      remote_url? ? remote_origin.gsub(/\.git$/, '') : ssh_to_url
+    end
+
+    def compare_url(from, to)
+      remote_url + "/compare/#{from}...#{to}"
+    end
+
+    def compare_before(num)
+      compare_url(head_before(num), head)
+    end
+
+    private
+
+    def get_remote_origin
+      `git config --get remote.origin.url`.strip
+    end
+
+    def remote_url?
+      URI.parse(remote_origin).is_a?(URI::HTTP) rescue false
+    end
+
+    def ssh_to_url
+      "https://github.com/#{remote_origin.gsub(/git@github.com:/, '').gsub(/\.git$/, '')}"
+    end
+
+    def head
+      `git rev-parse HEAD`.strip
+    end
+
+    def head_before(num)
+      `git rev-parse HEAD~#{num}`.strip
+    end
+  end
+end

data/lib/gh_compare/exec/commit_compare.rb

@@ -0,0 +1,54 @@
+require 'optparse'
+require_relative '../commit_compare'
+
+module GhCompare::Exec
+  class CommitCompare
+    attr_reader :options
+
+    def initialize(args)
+      @options = parse_args(args)
+    end
+
+    def run
+      return compare_before if num_arg_passed?
+      return compare_url if commit_arg_passed?
+    end
+
+    private
+
+    def parse_args(args)
+      opts = {}
+      OptionParser.new do |opt|
+        opt.on('--n=NUM', Integer) { |v| opts[:num] = v }
+        opt.on('--d==V,V', Array) { |v| opts[:commits] = v }
+
+        opt.parse!(args)
+      end
+      opts
+    end
+
+    def num_arg_passed?
+      options[:num]
+    end
+
+    def compare_before
+      GhCompare::CommitCompare.new.compare_before(options[:num])
+    end
+
+    def commit_arg_passed?
+      options[:commits]
+    end
+
+    def compare_url
+      GhCompare::CommitCompare.new.compare_url(from_commit, to_commit)
+    end
+
+    def from_commit
+      options[:commits][0]
+    end
+
+    def to_commit
+      options[:commits][1]
+    end
+  end
+end

data/lib/gh_compare/version.rb

@@ -1,3 +1,3 @@
 module GhCompare
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/gh_compare.rb

@@ -1,47 +1,8 @@
 require 'uri'
+require_relative './gh_compare/commit_compare'
+require_relative './gh_compare/exec/commit_compare'
 
 module GhCompare
   class Error < StandardError; end
-
-  class CommitCompare
-    attr_reader :remote_origin
-
-    def initialize
-      @remote_origin = get_remote_origin
-    end
-
-    def remote_url
-      remote_url? ? remote_origin.gsub(/\.git$/, '') : ssh_to_url
-    end
-
-    def compare_url(from, to)
-      remote_url + "/compare/#{from}...#{to}"
-    end
-
-    def compare_before(num)
-      compare_url(head_before(num), head)
-    end
-
-    private
-
-    def get_remote_origin
-      `git config --get remote.origin.url`.strip
-    end
-
-    def remote_url?
-      URI.parse(remote_origin).is_a?(URI::HTTP) rescue false
-    end
-
-    def ssh_to_url
-      "https://github.com/#{remote_origin.gsub(/git@github.com:/, '').gsub(/\.git$/, '')}"
-    end
-
-    def head
-      `git rev-parse HEAD`.strip
-    end
-
-    def head_before(num)
-      `git rev-parse HEAD~#{num}`.strip
-    end
-  end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gh_compare
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - kenzo-tanaka
@@ -72,6 +72,8 @@ files:
 - bin/gh_compare
 - gh_compare.gemspec
 - lib/gh_compare.rb
+- lib/gh_compare/commit_compare.rb
+- lib/gh_compare/exec/commit_compare.rb
 - lib/gh_compare/version.rb
 homepage: https://github.com/kenzo-tanaka/gh_compare
 licenses: