deathnote 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d803893053af72a3692f28ce2eabebbc91b96f29
-  data.tar.gz: 21afd988adf1d4b7bf2b484104c6a3c8bbaac21e
+  metadata.gz: ff1992993b2ffb3d3bff206c922aed61df172b72
+  data.tar.gz: 229c58189b2ff5c339edfccbeafd9abb392975e6
 SHA512:
-  metadata.gz: d95f737032733f0f1d7d4a3262050f882e1ac831d740117e1f867f4ee252f2970c32623e4cb7b86cb886e78a5e6a1ea041fa58ae881a918f5a4231af5ebb60c6
-  data.tar.gz: 0646d78846d451737466632714e552990b2784039b0b91803d53367313f1501457ec36765e42bb96864a598f1bc4831233d6e1394c46137b704410d225671e4e
+  metadata.gz: d14035c3ca967ca2689159c1d59dd73b698bd9521c172727bb95959c6163336403dd4c319ca97c342e5ffcb3530723d6a96e6fadeb28c9d2c8e694c169ee1d6d
+  data.tar.gz: 101d59c1a2bd001a5f12c894ec25a397d7ee3d1103d4558037f521ae478cc0372cac06e1ed1ab15f90fcf2daba70c2bbff5267bfd93a91c21815935c96f38a8a

data/lib/deathnote.rb

@@ -9,19 +9,27 @@ module Deathnote
   class << self
     def run(argv)
       options = parse_options(argv)
-      old_branch = Open3.popen3('git rev-parse --abbrev-ref HEAD') { |_i, o, _e, _t| o.read.chomp }
+      backup_commit = cmd('git rev-parse --abbrev-ref HEAD')
 
-      base_missing = DeadCodes.new(branch: options[:base_commit], options: options.deep_clone).run
-      pr_missing = DeadCodes.new(branch: options[:compare_commit], options: options.deep_clone).run
-      Open3.popen3("git checkout #{old_branch}")
+      cmd("git checkout #{options[:past_commit]}")
+      past_missing = DeadCodes.new(options.deep_clone).run
 
-      pr_missing.
-        reject { |unused, _location| base_missing.has_key?(unused) }.
+      cmd("git checkout #{options[:newer_commit]}")
+      newer_missing = DeadCodes.new(options.deep_clone).run
+
+      newer_missing.
+        reject { |unused, _location| past_missing.has_key?(unused) }.
         each { |unused, location| puts "#{unused} #{location}" }
+    ensure
+      cmd("git checkout #{backup_commit}")
     end
 
     private
 
+    def cmd(command)
+      Open3.popen3(command) { |_i, o, _e, _t| o.read.chomp }
+    end
+
     def parse_options(argv)
       options = {}
       OptionParser.new do |opts|
@@ -31,11 +39,12 @@ module Deathnote
           puts opts
           exit
         end
-        opts.on('-b', '--base=[commit hash]', 'Specify base commit hash.') do |base_commit|
-          options[:base_commit] = base_commit
+        opts.on('-p[commit hash]', '--past-commit=[commit hash]', 'Specify past commit hash.') do |past_commit|
+          p past_commit
+          options[:past_commit] = past_commit
         end
-        opts.on('-c', '--compare[commit hash]', 'Specify compare commit hash.') do |compare_commit|
-          options[:compare_commit] = compare_commit
+        opts.on('-n[commit hash]', '--newer-commit=[commit hash]', 'Specify newer commit hash.') do |newer_commit|
+          options[:newer_commit] = newer_commit
         end
         opts.on('-r', '--rails', 'Filter some rails call conversions.') do
           options[:rails] = true
@@ -48,21 +57,18 @@ module Deathnote
 
       options
     rescue OptionParser::InvalidOption => e
-      warn op.to_s
-      warn ""
+      warn "Fail to parse options."
       warn e.message
       exit 1
     end
   end
 
   class DeadCodes
-    def initialize(branch:, options:)
-      @branch = branch
+    def initialize(options)
       @options = options
     end
 
     def run
-      Open3.popen3("git checkout #{@branch}")
       to_list(run_debride)
     end
 

data/lib/deathnote/version.rb

@@ -1,3 +1,3 @@
 module Deathnote
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deathnote
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Shia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler