sfb_scripts 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa1bfa22f42bad325e3fae6d68a8cf56ae0ddadf
-  data.tar.gz: ef3751b60b61a8ccf310cb1f4bc6ccd08dd54361
+  metadata.gz: 37feb93572e3de507db54fb6a99028c40e3cb35d
+  data.tar.gz: 108e6cc518c42438b967c84dcab6071ca033816d
 SHA512:
-  metadata.gz: 623055c0dbf1357e7ca7c91ea2d1632d6456c5e842e89cc7d7691dcb0e2d98ce1b20902b28ef8b30d5af6a8d81fcbaba21ffd8fac848bc3b9f669d099ae54154
-  data.tar.gz: 12c2377cf70bbfab5505e18847994f2538cc747a5ed6b6836e86b462877e13693da6e515f70b4a0aace25487ffeecf92f4522f15ce2733b935e1a52956bfd5df
+  metadata.gz: 2e4342556ab9a7b92933310ba7661b27ce371b32fd29ae938a43ead87c1d30c357f9f22a98e0aa208ac29a6de9ac6a49fb544254ea0ad1d07755328ca1399abb
+  data.tar.gz: 9305964ae8a97f4f234e388ad53f611e697b7608c4c9d0f779a3a717b715e0d5a9e56313de02827124172f10874298bd6687618983af045375a06a4b7ba8a8cd

data/bin/app_up

@@ -13,10 +13,16 @@ class CLI < Thor
   option :loud, :type => :boolean, :desc => 'Pipe output to terminal or not (output is always piped to /tmp/app_up.log)'
   option :no_git, aliases: ['--no-pull', '--no-rebase'], :type => :boolean, :desc => "Don't update the repo, just bundle and migrate everywhere."
   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, desc: "Specify what command to pass to git [Example: app_up --git-action 'pull --rebase origin branch_name'].  Defaults to 'pull --rebase origin master'."
 
   def up
     if options[:no_git]
       Upper.no_git(options)
+    elsif options[:on_branch]
+      Upper.rebase_on_branch!(options)
+    elsif options[:git_action]
+      Upper.arbitrary_action!(options[:git_action], options)
     else
       Upper.rebase_on_master!(options)
     end

data/bin/test_runner

@@ -4,7 +4,8 @@ require 'thor'
 require_relative '../lib/sfb_scripts/tester'
 
 class CLI < Thor
-
+  class_option :verbose, type: :boolean, desc: "Pipe the log file to stdout."
+  class_option :loud, type: :boolean, desc: "Show all shell commands being run.  This *does not* show the output of those commands, only what is being run."
   #
   # run
   #
@@ -21,8 +22,13 @@ class CLI < Thor
   desc "find", <<-DESC
     Find tests and run them. By trying to match an individual test or the name of a test file(s).
   DESC
-  def find(*inputs)
-    Tester.find(inputs, options)
+  def find(input)
+    if input == '--help'
+      puts "use 'test_runner --help find' to see the help"
+      exit
+    end
+
+    Tester.find(input, options)
   end
 
   desc "status_check", "Verify that you don't edit a file without editing its corresponding test file."
@@ -31,7 +37,7 @@ class CLI < Thor
     Tester.status_check(options)
   end
 
-  default_task :status
+  default_task :status_check
 
 end
 

data/lib/sfb_scripts/dependency_loader.rb

@@ -10,10 +10,11 @@ require_relative 'repositories/active_repo'
 require_relative 'repositories/lazy_repo'
 require_relative 'shells/shell_runner'
 require_relative 'shells/loud_shell_runner'
+require_relative 'shells/verbose_shell_runner'
 require_relative 'test_running/status_checker'
 require_relative 'test_running/test_case'
 require_relative 'test_running/test_collection'
-require_relative 'test_running/test_file_runner'
-require_relative 'test_running/test_method_runner'
+require_relative 'test_running/status_test_runner'
 require_relative 'test_running/test_runner'
+require_relative 'test_running/test_finder'
 require_relative 'folder_guard'

data/lib/sfb_scripts/needs_manager.rb

@@ -41,7 +41,9 @@ class NeedsManager
   end
 
   def shell_class
-    if options[:loud]
+    if options[:verbose]
+      VerboseShellRunner
+    elsif options[:loud]
       LoudShellRunner
     else
       ShellRunner

data/lib/sfb_scripts/repositories/active_repo.rb

@@ -1,11 +1,11 @@
 class ActiveRepo < Repo
 
-  def rebase_on_master!
+  def alter!(git_command)
     shell.notify "\nRebasing current branch on master:"
     up do
       # will raise an error with merge conflicts
       begin
-        shell.run "git pull --rebase origin master"
+        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`

data/lib/sfb_scripts/shells/loud_shell_runner.rb

@@ -1,8 +1,7 @@
 class LoudShellRunner < ShellRunner
 
-  def run(*args)
-    super(*args).tap do |results|
-      puts results
-    end
+  def handle_output_for(cmd)
+    puts cmd
+    log(cmd)
   end
 end

data/lib/sfb_scripts/shells/shell_runner.rb

@@ -12,8 +12,11 @@ class ShellRunner
 
   def run(cmd, dir: working_directory)
     command = "cd #{dir} && #{cmd}"
-    puts command
-    log command
+    handle_output_for(command)
+    shell_out(command)
+  end
+
+  def shell_out(command)
     %x{ set -o pipefail && #{command} 2>> #{log_path} | tee -a #{log_path} }.chomp.tap do
       raise CommandFailureError, "The following command has failed: #{command}.  See #{log_path} for a full log." if ($?.exitstatus != 0)
     end
@@ -65,4 +68,8 @@ class ShellRunner
     %x{echo "" > #{log_path}}
   end
 
+  def handle_output_for(cmd)
+    log(cmd)
+  end
+
 end

data/lib/sfb_scripts/shells/verbose_shell_runner.rb

@@ -0,0 +1,8 @@
+class VerboseShellRunner < LoudShellRunner
+
+  def run(*args)
+    super(*args).tap do |results|
+      puts results
+    end
+  end
+end

data/lib/sfb_scripts/test_running/{test_file_runner.rb → status_test_runner.rb}

@@ -1,8 +1,4 @@
-class TestFileRunner
-
-  def self.find(inputs, env)
-    new(env, false).find(inputs)
-  end
+class StatusTestRunner
 
   def self.status(env, ignore_selenium=false)
     new(env, ignore_selenium).status
@@ -16,16 +12,6 @@ class TestFileRunner
     @ignore_selenium = ignore_selenium
   end
 
-  def find(inputs)
-    files = []
-    inputs.each {|input| files << repo.find_files(input).map {|f| {:file => f} } }
-    files.flatten!
-    @tests = TestCollection.new(files)
-
-    return false unless @tests.present?
-    test_runner.run_files(tests)
-  end
-
   def status
     files = repo.status_files.map {|f| {:file => f} }
     @tests = TestCollection.new(files)

data/lib/sfb_scripts/test_running/test_case.rb

@@ -3,8 +3,10 @@ class TestCase
 
   attr_reader :working_dir, :relative_path, :test_name, :full_path
 
-  def initialize(full_path: raise, test_name: '')
-    @test_name = test_name
+  def initialize(full_path: raise, line: '')
+    raise 'Bad Test File' unless full_path.match(/_test\.rb/)
+
+    @test_name = test_name_from_grepped_line(line)
     @full_path = full_path
   end
 
@@ -17,6 +19,10 @@ class TestCase
       end
   end
 
+  def is_method?
+    ! @test_name.nil?
+  end
+
   def relative_path
     @relative_path ||= full_path.gsub(/^#{working_dir.gsub(/^\.\//, '')}/, '') || raise_file_path_error
   end
@@ -24,4 +30,9 @@ class TestCase
   def raise_file_path_error
     raise TestDirectoryError.new("Can't find test's relative path")
   end
+
+  def test_name_from_grepped_line(line)
+    return unless line && line.match(/^\s*def\s+test_/)
+    @test_name = line.strip.gsub(/^\s*def\s+/, '').strip
+  end
 end

data/lib/sfb_scripts/test_running/test_collection.rb

@@ -2,20 +2,14 @@ class TestCollection
 
   MultipleWorkingDirectoriesError = Class.new(StandardError)
 
-  def self.parse(grep_result)
-    new(grep_result[:file], line: grep_result[:line]).parse
-  end
-
-
-  def self.from_file_path(file_path)
-    new(file_path).from_file_path
-  end
-
   attr_reader :tests
 
-  def initialize(tests_data)
+  def initialize(tests_data=[])
     @tests = tests_data.map do |test_data|
-      create_test_case(test_data)
+      TestCase.new(
+        full_path: test_data[:file],
+        line: test_data[:line]
+      )
     end.compact
   end
 
@@ -39,6 +33,10 @@ class TestCollection
     tests[*args]
   end
 
+  def all?(&block)
+    tests.all?(&block)
+  end
+
   def in_one_file?
     full_paths.size == 1
   end
@@ -81,23 +79,8 @@ class TestCollection
     return working_dirs.first
   end
 
-  private
-
-  def find_test_name(grepped_line)
-    return nil unless grepped_line && grepped_line.match(/^\s*def\s+test_/)
-
-    grepped_line.strip.gsub(/^\s*def /, '').strip
-  end
-
-  def create_test_case(test_data)
-    file_path = test_data[:file]
-    test_name = find_test_name(test_data[:line])
-    return nil if ! file_path.match(/_test\.rb/)
-
-    TestCase.new(
-      full_path: file_path,
-      test_name: test_name
-    )
+  def is_one_test_method?
+    (size == 1) &&  tests.first.is_method?
   end
 
 end

data/lib/sfb_scripts/test_running/test_finder.rb

@@ -0,0 +1,66 @@
+class TestFinder
+
+  def self.find(query, env)
+    new(env, query).find
+  end
+
+  attr_accessor :shell, :repo, :query
+  def initialize(env, query)
+    @shell = env[:shell]
+    @repo = env[:repo]
+    @query = query
+    @regex_searches = {}
+  end
+
+  def find
+    return tests_found_by_name if tests_found_by_name.present?
+
+    return tests_found_by_file_name if tests_found_by_file_name.present?
+
+    return tests_found_by_full_regex if tests_found_by_full_regex.present?
+
+    return TestCollection.new
+  end
+
+  private
+
+  def tests_found_by_name
+    @tests_found_by_name ||=
+      begin
+        tests_found_by_full_regex("^\s*def .*#{query}.*")
+      end
+  end
+
+  def tests_found_by_full_regex(regex = query)
+    @regex_searches[regex] ||=
+      begin
+        test_matches = []
+        begin
+          test_matches =  repo.grep(regex, file_pattern: '*_test.rb')
+        rescue ShellRunner::CommandFailureError
+          # git grep returns 1 if no results found
+        end
+
+        TestCollection.new(test_matches)
+      end
+  end
+
+  def tests_found_by_file_name
+    @tests_found_by_file_name ||=
+      begin
+        files = []
+        files << repo.find_files(query).map {|f| {:file => f} }
+        files.flatten!
+        TestCollection.new(files)
+      end
+  end
+
+  def might_be_method?(query)
+    ! is_file_path?(query)
+  end
+
+  def is_file_path?(query)
+    !! query.match(/\.rb/)
+  end
+
+end

data/lib/sfb_scripts/test_running/test_runner.rb

@@ -6,6 +6,27 @@ class TestRunner
     @all_engines_param = env[:all_engines]
   end
 
+  # this could use some love
+  def run(tests)
+    if 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."
+      run_files(tests)
+    elsif tests.in_one_file?
+      shell.notify "Matched one file."
+      run_files(tests)
+    elsif tests.in_one_engine? && tests.full_paths.size < 4 # hack: maybe should ask here?
+      shell.notify "Multiple matches across files in same engine. Running those files."
+      run_files(tests)
+    else
+      shell.warn 'Found too many tests:'
+      tests[0..10].each {|t| shell.notify "#{t.full_path}: #{t.test_name}" }
+      shell.notify '...'
+      exit
+    end
+  end
+
   def run_method(test)
     test_runner = named_test_runner(test.working_dir)
 
@@ -25,8 +46,6 @@ class TestRunner
     end
   end
 
-  private
-
   def run_across_engines(tests)
     shell.notify "\nfinding test runners"
     tests.working_dirs.each do |engine_dir|

data/lib/sfb_scripts/tester.rb

@@ -26,42 +26,19 @@ class Tester
     @env = env
   end
 
-  def find(inputs)
-    # each of these replaces this process if successful
-    # so no need for logic control flow
-    if query_might_be_method?(inputs)
-      TestMethodRunner.run(inputs.first, env)
-    end
-
-    TestFileRunner.find(inputs, env)
-
-    TestMethodRunner.run_file_with_match(inputs.first, env)
+  def find(input)
+    tests = TestFinder.find(input, env)
 
+    env[:test_runner].run(tests)
     env[:shell].warn "Giving up :("
   end
 
   def status(options)
-    TestFileRunner.status(env, options[:no_selenium])
+    StatusTestRunner.status(env, options[:no_selenium])
   end
 
   def status_check(options)
     StatusChecker.report(env, options[:confirm_exit_status])
   end
 
-  private
-
-  def query_might_be_method?(inputs)
-    if inputs.any? {|input| is_file_path?(input) }
-      false
-    elsif inputs.size > 1
-      false
-    else
-      true
-    end
-  end
-
-  def is_file_path?(input)
-    !! input.match(/\.rb/)
-  end
-
 end

data/lib/sfb_scripts/upper.rb

@@ -6,28 +6,42 @@ class Upper
     [:shell, :repo, :bundler, :migrator]
   end
 
+  def self.with_defaults(options)
+    {loud: true}.merge(options)
+  end
+
+  def self.arbitrary_action!(git_command, options)
+    env = NeedsManager.configure(:up, needs, with_defaults(options).merge(repo_type: :active))
+    new(env).arbitrary_action!(git_command)
+  end
+
+  def self.rebase_on_branch!(options)
+    env = NeedsManager.configure(:up, needs, with_defaults(options).merge(repo_type: :active))
+    new(env).arbitrary_action!("pull --rebase origin #{env[:repo].current_branch}")
+  end
+
   def self.rebase_on_master!(options)
-    env = NeedsManager.configure(:up, needs, options.merge(repo_type: :active))
-    new(env).rebase_on_master!
+    env = NeedsManager.configure(:up, needs, with_defaults(options).merge(repo_type: :active))
+    new(env).arbitrary_action!("pull --rebase origin master")
   end
 
   def self.up_master!(options)
-    env = NeedsManager.configure(:up, needs, options.merge(repo_type: :active))
+    env = NeedsManager.configure(:up, needs, with_defaults(options).merge(repo_type: :active))
     new(env).up_master!
   end
 
   def self.no_git(options)
-    env = NeedsManager.configure(:up, needs, options.merge(repo_type: :lazy))
+    env = NeedsManager.configure(:up, needs, with_defaults(options).merge(repo_type: :lazy))
     new(env).no_git
   end
 
   def self.install_hooks(options)
-    env = NeedsManager.configure(:up, needs, options.merge(repo_type: :lazy))
+    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, options.merge(repo_type: :lazy))
+    env = NeedsManager.configure(:up, needs, with_defaults(options).merge(repo_type: :lazy))
     new(env).pre_push_hook(git_command)
   end
 
@@ -46,8 +60,8 @@ class Upper
     migrator.migrate_where_necessary
   end
 
-  def rebase_on_master!
-    repo.rebase_on_master!
+  def arbitrary_action!(git_command)
+    repo.alter!(git_command)
     bundler.bundle_where_necessary
     migrator.migrate_where_necessary
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfb_scripts
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -72,11 +72,12 @@ files:
 - lib/sfb_scripts/repositories/repo.rb
 - lib/sfb_scripts/shells/loud_shell_runner.rb
 - lib/sfb_scripts/shells/shell_runner.rb
+- lib/sfb_scripts/shells/verbose_shell_runner.rb
 - lib/sfb_scripts/test_running/status_checker.rb
+- lib/sfb_scripts/test_running/status_test_runner.rb
 - lib/sfb_scripts/test_running/test_case.rb
 - lib/sfb_scripts/test_running/test_collection.rb
-- lib/sfb_scripts/test_running/test_file_runner.rb
-- lib/sfb_scripts/test_running/test_method_runner.rb
+- lib/sfb_scripts/test_running/test_finder.rb
 - lib/sfb_scripts/test_running/test_runner.rb
 - lib/sfb_scripts/tester.rb
 - lib/sfb_scripts/upper.rb

data/lib/sfb_scripts/test_running/test_method_runner.rb

@@ -1,59 +0,0 @@
-class TestMethodRunner
-
-  def self.run(regex, env)
-    new(env).run(regex)
-  end
-
-  def self.run_file_with_match(regex, env)
-    new(env, pure_regex: true).run(regex)
-  end
-
-  attr_reader :regex, :repo, :shell, :test_runner
-  def initialize(env, pure_regex: false)
-    @repo = env[:repo]
-    @shell = env[:shell]
-    @test_runner = env[:test_runner]
-    @pure_regex = pure_regex
-  end
-
-  def run(regex)
-    @regex = regex
-
-    if tests.empty?
-      shell.notify "Could not find matching test method."
-      return false
-    elsif tests.size == 1
-      if @pure_regex
-        test_runner.run_files(tests)
-      else
-        test_runner.run_method(tests.first)
-      end
-    elsif tests.in_one_file?
-      shell.notify "Multiple matches in same file. Running that file."
-      test_runner.run_files(tests)
-    elsif tests.in_one_engine? && tests.full_paths.size < 4 # hack: maybe should ask here?
-      shell.notify "Multiple matches across files in same engine. Running those files."
-      test_runner.run_files(tests)
-    else
-      shell.warn 'Found too many tests:'
-      tests[0..10].each {|t| shell.notify "#{t.full_path}: #{t.test_name}" }
-      shell.notify '...'
-      exit
-    end
-  end
-
-  def tests
-    @test_collection ||= TestCollection.new(find_tests_by_name)
-  end
-
-  def find_tests_by_name
-    test_def_regex = @pure_regex ? regex : "^\s*def .*#{regex}.*"
-    begin
-      return repo.grep(test_def_regex, file_pattern: '*_test.rb')
-    rescue ShellRunner::CommandFailureError
-      # git grep exits with 1 if no results
-      return []
-    end
-  end
-
-end