sfb_scripts 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3ad38215f4249ca5652663a96aa9ef60fab5e35
-  data.tar.gz: 6e5446a3f26ec027a7d56500f614231ca42bc319
+  metadata.gz: 7b7e35b7d495028d01f0666488b16b4e7394245a
+  data.tar.gz: 808d270802a6e27573e3109772d5b89748734bd6
 SHA512:
-  metadata.gz: 4467e3a0c8df9978c713fd1e2e3f79be254ffed509986f73a049fbc2f93df27924a460a0f89db81dca7588451fcae644330fb711a1604e967b7f7b75fa8b07e0
-  data.tar.gz: e14fe39d5eac9bf158a1defdc81852eb3e48d893a2eef1c8206eaaf182289f2bb2f9c16a5a0b6564217bfd03695587c60bc7f653c1842ab269b9e25621e85e17
+  metadata.gz: dcfdec107a2c4040d91a7edfa9a882a99cd0116364eed5ff834a87ca1176ffc4b2e243bd40a0ba0ce14afc559c0a1f6dc790fc2f641f33628439620ef7dae209
+  data.tar.gz: f060b3d98d0b96486daf9accaa4844b933f2aae942c078271e44404ed6855c27dbcfc93c7630a6f6eae335acebb96bfd4fbf40724715692d87303f3ebe4d4324

data/bin/app_up

@@ -5,6 +5,31 @@ require_relative '../lib/sfb_scripts/upper'
 
 class CLI < Thor
 
+  def initialize(args, options, config)
+    # reset --hard hack!
+    #
+    # if the -g option is passed,
+    # we concatenate the rest of the
+    # command into a single string.
+    #
+    # This prevents Thor from interpreting
+    # app_up -g reset --hard
+    # as having the flags -g and --hard
+    #
+    # (we want to ignore the --hard
+    # and just pass it on to git)
+
+    action_flag_index = options.find_index('-g') || options.find_index('--git-action') || options.find_index('--action')
+
+    if action_flag_index
+      new_options = options[0..action_flag_index]
+      new_options << options[action_flag_index+1 .. -1].join(' ')
+      options = new_options
+    end
+
+    super(args, options, config)
+  end
+
   #
   # REBASE
   #
@@ -15,10 +40,13 @@ class CLI < Thor
   option :ignore, type: :array, desc: "Directories matching this pattern will be ignored.  Example: 'app_up --ignore engines' will not bundle or migrate in a directory matching the word engines.  You can specify multiple patterns: 'app_up --ignore dir1 dir2"
   option :on_branch, desc: "Rebase the current branch onto it's upstream counterpart. [Example: While on branch (feature_branch), using the --on-branch flag will yield the git command: 'git pull --rebase origin feature_branch'", default: 'master', default: false
   option :git_action, aliases: ['--action', '-g'], type: :array, desc: "Specify what command to pass to git [Example: app_up --git-action 'pull --rebase origin branch_name'].  Defaults to 'pull --rebase origin master'."
+  option :finish_rebase, aliases: ['--finish-merge'], type: :boolean, desc: "Recovers from rebase or merge conflicts"
 
   def up
     if options[:no_git]
       Upper.no_git(options)
+    elsif options[:finish_rebase]
+      Upper.finish_rebase(options)
     elsif options[:on_branch]
       Upper.rebase_on_branch!(options)
     elsif options[:git_action]

data/lib/sfb_scripts/needs_manager.rb

@@ -13,7 +13,8 @@ class NeedsManager
   def initialize(task, needs, options)
     @log_file = log_file_for(task)
     @needs = needs
-    @options = options
+    # symbolize_keys
+    @options = options.inject({}){|results,(k,v)| results[k.to_sym] = v; results}
     @env = {}
   end
 

data/lib/sfb_scripts/repositories/active_repo.rb

@@ -1,14 +1,13 @@
 class ActiveRepo < Repo
 
   def alter!(git_command)
-    shell.notify "\nRebasing current branch on master:"
+    shell.notify "\nUpdating repo state:"
     up do
       # will raise an error with merge conflicts
       begin
         shell.run "git #{git_command}"
       rescue ShellRunner::CommandFailureError
         puts "Unable to rebase.  Maybe you need to stash local changes, or there are rebase conflicts"
-        puts `git status`
         exit
       end
     end
@@ -42,6 +41,11 @@ class ActiveRepo < Repo
     end
   end
 
+  def compare_with_reflog
+    old_sha = shell.run "git rev-parse HEAD@{2}"
+    set_files_changed(old_sha)
+  end
+
   def fetch_origin
     shell.run 'git fetch origin'
   end

data/lib/sfb_scripts/repositories/repo.rb

@@ -31,7 +31,7 @@ class Repo
   end
 
   def grep(regex, file_pattern: '*')
-    results = shell.run("git grep '#{regex}' -- '#{file_pattern}'").split("\n")
+    results = shell.run("git grep --untracked '#{regex}' -- '#{file_pattern}'").split("\n")
     results.map do |result|
       interpret_grep_result(result)
     end

data/lib/sfb_scripts/test_running/test_runner.rb

@@ -8,7 +8,10 @@ class TestRunner
 
   # this could use some love
   def run(tests)
-    if tests.is_one_test_method?
+    if tests.empty?
+      shell.warn "Unable to identify any tests."
+      exit
+    elsif tests.is_one_test_method?
       run_method(tests.first)
     elsif tests.in_one_file? && tests.all? {|t| t.is_method? }
       shell.notify "Multiple matches in same file. Running that file."

data/lib/sfb_scripts/upper.rb

@@ -35,13 +35,18 @@ class Upper
     new(env).no_git
   end
 
+  def self.finish_rebase(options)
+    env = NeedsManager.configure(:up, needs, with_defaults(options).merge(repo_type: :active))
+    new(env).finish_rebase
+  end
+
   def self.install_hooks(options)
     env = NeedsManager.configure(:up, needs, with_defaults(options).merge(repo_type: :lazy))
     new(env).install_hooks
   end
 
   def self.pre_push_hook(git_command, options)
-    env = NeedsManager.configure(:up, needs, with_defaults(options).merge(repo_type: :lazy))
+    env = NeedsManager.configure(:up, needs, with_defaults(options).merge(repo_type: :active))
     new(env).pre_push_hook(git_command)
   end
 
@@ -72,6 +77,12 @@ class Upper
     migrator.migrate_where_necessary
   end
 
+  def finish_rebase
+    repo.compare_with_reflog
+    bundler.bundle_where_necessary
+    migrator.migrate_where_necessary
+  end
+
   def install_hooks
     HookManager.install!(env)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfb_scripts
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor