sfb_scripts 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad64628594616c16074cdf1dc8a025a2d788778
-  data.tar.gz: 48f17df97550e050c646e3c15cae131a14a07a1c
+  metadata.gz: 1c4ffa5f6768611b201947a331bc2d19b6c4f33e
+  data.tar.gz: 1e12c961a87746e5887e2b816dd3fc9471b1a677
 SHA512:
-  metadata.gz: 66862b0679ce60cd59bd4075627014fe2cc9c13228ce18c6e6d956687d757a7c067353287553917d5a688e39da8e133a82e959ffc85fd43ac96efae16b190377
-  data.tar.gz: 0df73ca2bf1cb38a5444ff17ce152504d628bc2c3ee4466af52586f65b46064428120bac50e9a53bee22446bec0f745762512bc2b8d3beb116d11a6e8c652e6d
+  metadata.gz: 06b67e433f81d759194d524ea86ae36fabbd883ed5479f3de148c392d42ed0e289ba2e922bc59dcef4e75feddf07c81ba07bf1829495619e2ed210fce8338a49
+  data.tar.gz: 9317810f154b2ab142732c27c11e5855c38a00ae08175166961ff3718a52188300620d891e77ffa9b08f2054b70f308ff36cf2b6208d2ea9b55587060db27b4a

data/bin/app_up

@@ -9,10 +9,10 @@ class CLI < Thor
   # REBASE
   #
 
-  desc "up", "Rebase your commits onto master. Bundle installs and migrates as needed.  Will terminate if conflicts are found."
+  desc :up, "Rebase your commits onto master. Bundle installs and migrates as needed.  Will terminate if conflicts are found.  After conflicts are resolved, run again with --no-rebase."
   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', '--all'], :type => :boolean, :desc => "Don't update the repo, just bundle and migrate everywhere."
-  option :engines, type: :boolean, default: false, desc: "Perform actions in engines as well"
+  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"
 
   def up
     if options[:no_git]

data/lib/sfb_scripts/dependency_loader.rb

@@ -0,0 +1,19 @@
+require 'work_queue'
+
+# this is a bummer...
+require_relative 'monkey_patches/string_extension'
+require_relative 'bundler/bundle_manager'
+require_relative 'hooks/pre_push_hook'
+require_relative 'migrations/migrator'
+require_relative 'repositories/repo'
+require_relative 'repositories/active_repo'
+require_relative 'repositories/lazy_repo'
+require_relative 'shells/shell_runner'
+require_relative 'shells/loud_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/test_runner'
+require_relative 'folder_guard'

data/lib/sfb_scripts/migrations/migrator.rb

@@ -1,8 +1,6 @@
 class Migrator
   attr_accessor :shell, :repo, :queue, :folder_guard
 
-  # hack: move engines flag into
-  # another object that decides
   def initialize(repo: raise, shell: raise, queue: raise, folder_guard: raise)
     @shell = shell
     @repo = repo
@@ -14,7 +12,7 @@ class Migrator
     shell.notify "\nMigrating:"
     migrations.each do |migration|
       queue.enqueue_b do
-        shell.run "RAILS_ENV=#{migration[:env]} bundle exec rake db:migrate", dir: migration[:dir]
+        shell.run "RAILS_ENV=#{migration[:env]} bundle exec rake db:create db:migrate", dir: migration[:dir]
       end
     end
     queue.join

data/lib/sfb_scripts/needs_manager.rb

@@ -1,23 +1,4 @@
-require 'work_queue'
-
-# this is a bummer...
-require_relative 'monkey_patches/string_extension'
-require_relative 'bundler/bundle_manager'
-require_relative 'hooks/pre_push_hook'
-require_relative 'migrations/migrator'
-require_relative 'repositories/repo'
-require_relative 'repositories/active_repo'
-require_relative 'repositories/lazy_repo'
-require_relative 'shells/shell_runner'
-require_relative 'shells/loud_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/test_runner'
-require_relative 'folder_guard'
-
+require_relative 'dependency_loader'
 
 class NeedsManager
 
@@ -68,8 +49,7 @@ class NeedsManager
   end
 
   def create_folder_guard
-    denied_folders = []
-    denied_folders << 'engines' if ! options[:engines]
+    denied_folders = options[:ignore] || []
     env[:folder_guard] = FolderGuard.new(denied_folders)
   end
 

data/lib/sfb_scripts/repositories/repo.rb

@@ -10,12 +10,10 @@ class Repo
     @shell = shell
   end
 
-
   def changed?(file_path)
     files_changed.include? file_path
   end
 
-
   def find_files(pattern)
     shell.run("git ls-files '*#{pattern}*'").split("\n")
   end
@@ -47,8 +45,16 @@ class Repo
 
   def interpret_grep_result(grep_result)
     splits = grep_result.split(/:/)
-    file = splits.shift
-    line = splits.join(':')
+    file = splits.shift.strip
+    # we rejoin on ':' because our
+    # code may have colons inside of it.
+    #
+    # example:
+    # path/to/file: run_method(a: A, b: B)
+    #
+    # so shift the first one out, then
+    # rejoin the rest
+    line = splits.join(':').strip
 
     {
       :file => file,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfb_scripts
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/sfb_scripts/bundler/bundle_manager.rb
+- lib/sfb_scripts/dependency_loader.rb
 - lib/sfb_scripts/folder_guard.rb
 - lib/sfb_scripts/hook_manager.rb
 - lib/sfb_scripts/hooks/pre_push_hook.rb
@@ -106,3 +107,4 @@ signing_key:
 specification_version: 4
 summary: Easily update your rails app and run tests from command line
 test_files: []
+has_rdoc: