git_commands 3.2.6 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2936c4e9f2983c15ed57ca5771dfa518d2aeecd9
-  data.tar.gz: 095c33cffbb33c11c3069b62607892e8db2944fe
+  metadata.gz: fbe7c65035ffcdc39c81b47463b9314aa07ab8a3
+  data.tar.gz: e0ce45188c080726af5ce804af1da49f2c5ed874
 SHA512:
-  metadata.gz: a88f137909b4d8607af9cb674eac69008e7fa88c9cbcd18403416a704cc50a1bd03f45d5dc1e03834ac7a1c7f1ba0884a2e558292791567cc0f8fd5e3e964e05
-  data.tar.gz: f57c3a817cdb54dd6a9428071d2dc90baf5d905bd0d1aa1a190046ac1a2608132e2fe5e06562fb4588d567adc49f6ccba6e3bb49df0af3983c375891027c9b73
+  metadata.gz: 0f165f80fcdb236a9da0549bd496f23573e996a3a8c4252a5b22e069350ac0007fd75268e585041eb6bb10546db5f597bc51eb48ae10f48bfa73e5736f3b266a
+  data.tar.gz: 9defaf6c85f58a02fcfe511e358443b4ff472074911f0ccea4ef4eca31c80f57e7416f42b990def0cae5b4b75bcada4107c23aed996923578aa0e535448f79ea

data/lib/git_commands/cli.rb

@@ -1,5 +1,5 @@
 require "optparse"
-require "git_commands/command"
+require "git_commands/computer"
 
 module GitCommands
   class CLI
@@ -9,9 +9,9 @@ module GitCommands
 
     class UnknownCommandError < ArgumentError; end
 
-    def initialize(command_name:, args: ARGV, out: STDOUT, command_klass: Command)
+    def initialize(command_name:, args: ARGV, out: STDOUT, computer_klass: Computer)
       @command_name = check_command_name(command_name)
-      @command_klass = command_klass
+      @computer_klass = computer_klass
       @args = args
       @out = out 
       @repo = nil
@@ -20,17 +20,13 @@ module GitCommands
 
     def call
       parser.parse!(@args)
-      command = @command_klass.new(repo: @repo, branches: @branches)
-      command.send(@command_name)
-    rescue Command::GitError, AbortError, Repository::InvalidError => e
+      computer = @computer_klass.new(repo: @repo, branches: @branches)
+      computer.send(@command_name)
+    rescue Computer::GitError, AbortError, Repository::InvalidError => e
       error(e.message)  
       exit
     end
 
-    private def create_command
-      return @command if @command
-    end
-
     private def check_command_name(name)
       return name if VALID_COMMANDS.include?(name)
       fail UnknownCommandError, "#{name} is not a supported command"

data/lib/git_commands/{command.rb → computer.rb}

@@ -6,7 +6,7 @@ require "git_commands/branch"
 require "git_commands/repository"
 
 module GitCommands
-  class Command
+  class Computer
     include Prompt
 
     class GitError < StandardError; end
@@ -44,10 +44,9 @@ module GitCommands
             `git pull origin #{branch}`
             next unless rebase_with_master
             `git push -f origin #{branch}`
-            `git checkout #{Branch::MASTER}`
-            `git branch -D #{branch}`
             success("Rebased successfully!")
           end
+          remove_locals
         end
       end
     end
@@ -98,5 +97,12 @@ module GitCommands
         yield
       end
     end
+
+    private def remove_locals
+      `git checkout #{Branch::MASTER}`
+      @branches.each do |branch|
+        `git branch -D #{branch}`
+      end
+    end
   end
 end

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.2.6"
+  VERSION = "3.2.8"
 end

data/lib/git_commands.rb

@@ -2,5 +2,5 @@ lib = File.expand_path("../../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "git_commands/version"
-require "git_commands/command"
+require "git_commands/computer"
 require "git_commands/cli"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_commands
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.8
 platform: ruby
 authors:
 - costajob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,7 @@ files:
 - lib/git_commands/branch.rb
 - lib/git_commands/cli.rb
 - lib/git_commands/colorize.rb
-- lib/git_commands/command.rb
+- lib/git_commands/computer.rb
 - lib/git_commands/prompt.rb
 - lib/git_commands/repository.rb
 - lib/git_commands/version.rb