sfb_scripts 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c25478096a96443654c5b18730012c7bd085d8c1
-  data.tar.gz: 590320e8848c363e490860e0ef2c90dc89938479
+  metadata.gz: 040cc528b5e6a229fa6b9410e85610233421f773
+  data.tar.gz: 7e6c87661337a595ce6c3bf3c879c45cd8b068ac
 SHA512:
-  metadata.gz: 8817e13fc7f3fbc658314c3d45e353059adda7608b34f960f21b732d0e35031fe4a99aceb80a509fc773c874c6d80545e92eda351136d03fce0df9428cbc4ced
-  data.tar.gz: c351955dd31c31cc70b9124522b689b29231cf547487e3063a0ebf1946b4fec307b9e8b1f2986f7a7b5e5f0901df5b60d746e33849f22b8c2ea9987566e08481
+  metadata.gz: ae6a576d2cf826975327162c7c1cc98534939e7b4b8b9b75d24a11ce11f644302f147e46cf86fcd0da1d508eab45598cceeb018a884d8c7fd81c8f55053e588e
+  data.tar.gz: c59781c6bbd1316b5e949e3939b46d8271c70822cfb9bc870e4c4ac3ec42bf4e55b234a89959108daa92d0f0b120926dbc4043ca64861425807f21f4f012a8f7

data/bin/app_up

@@ -11,10 +11,11 @@ class CLI < Thor
 
   desc "up", "Rebase your commits onto master. Bundle installs and migrates as needed.  Will terminate if conflicts are found."
   option :loud, :type => :boolean, :desc => 'Pipe output to terminal or not (output is always piped to /tmp/up.log)'
-  option :all, :type => :boolean, :desc => "Don't update the repo, just bundle and migrate everywhere."
+  option :no_git, aliases: :all, :type => :boolean, :desc => "Don't update the repo, just bundle and migrate everywhere."
+  option :no_engines, type: :boolean, desc: "Don't migrate engines"
 
   def up
-    if options[:all]
+    if options[:no_git]
       Upper.no_git(options)
     else
       Upper.rebase_on_master!(options)

data/lib/migrator.rb

@@ -1,9 +1,12 @@
 class Migrator
   attr_accessor :shell, :repo
 
-  def initialize(repo: raise, shell: raise)
+  # hack: move engines flag into
+  # another object that decides
+  def initialize(repo: raise, shell: raise, migrate_engines: raise)
     @shell = shell
     @repo = repo
+    @migrate_engines = migrate_engines
   end
 
   def migrate_where_necessary
@@ -14,15 +17,21 @@ class Migrator
   end
 
   def directories_to_migrate
-    migrate_dirs = repo.files_changed.select {|f| f.match("/migrate/") }.map {|f| File.dirname(f) }.uniq
+    migrate_dirs = repo.files_changed.select {|f| f.match("/migrate/") }.map {|f| File.dirname(f) }.map {|dir| dir.gsub(/\/db\/migrate$/, '')}.uniq
     migrate_dirs.select {|d| in_rack_application?(d) };
   end
 
   private
 
   def in_rack_application?(migrate_dir)
-    root_dir = migrate_dir.gsub(/db\/migrate$/, '')
-    true
+    if migrate_engines?
+      true
+    else
+      ! migrate_dir.match(/engines/)
+    end
   end
 
+  def migrate_engines?
+    @migrate_engines
+  end
 end

data/lib/needs_manager.rb

@@ -69,7 +69,7 @@ class NeedsManager
   end
 
   def create_migrator
-    env[:migrator] = Migrator.new(shell: env[:shell], repo: env[:repo])
+    env[:migrator] = Migrator.new(shell: env[:shell], repo: env[:repo], migrate_engines: ! options[:no_engines])
   end
 
   def create_test_runner

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfb_scripts
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -85,4 +85,3 @@ signing_key:
 specification_version: 4
 summary: Easily update your rails app and run tests from command line
 test_files: []
-has_rdoc: