sfb_scripts 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 040cc528b5e6a229fa6b9410e85610233421f773
-  data.tar.gz: 7e6c87661337a595ce6c3bf3c879c45cd8b068ac
+  metadata.gz: f0464c1e7fede7cccf98042d942788add0dfae24
+  data.tar.gz: 0fca59a3f0c6b4722fdbc13d6319fc5576a7fef1
 SHA512:
-  metadata.gz: ae6a576d2cf826975327162c7c1cc98534939e7b4b8b9b75d24a11ce11f644302f147e46cf86fcd0da1d508eab45598cceeb018a884d8c7fd81c8f55053e588e
-  data.tar.gz: c59781c6bbd1316b5e949e3939b46d8271c70822cfb9bc870e4c4ac3ec42bf4e55b234a89959108daa92d0f0b120926dbc4043ca64861425807f21f4f012a8f7
+  metadata.gz: 8051d17a37e864aceb3fcae7f7812670d41d09254742e53ccbe5a1cc6c4f204f39c78f24e25f9990cb53a70693dab393bf653126ba3577f99f01022fc6bb2f80
+  data.tar.gz: 325b98013c47a1b60020128b23f6c71b4ddfd3396691b27dfb7a69155b9a18a813a4deb2bf71ee13c373d0fdf62972a7d86017cab9c6d03db1495249cafac723

data/bin/app_up

@@ -9,12 +9,12 @@ class CLI < Thor
   # REBASE
   #
 
-  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)'
+  desc "app_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/app_up.log)'
   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
+  def app_up
     if options[:no_git]
       Upper.no_git(options)
     else
@@ -32,7 +32,7 @@ class CLI < Thor
     Upper.pre_push_hook(git_command, options)
   end
 
-  default_task :up
+  default_task :app_up
 end
 
 CLI.start(ARGV)

data/lib/active_repo.rb

@@ -3,6 +3,7 @@ require_relative 'repo'
 class ActiveRepo < Repo
 
   def rebase_on_master!
+    shell.notify "\nRebasing current branch on master:"
     up do
       # will raise an error with merge conflicts
       begin
@@ -21,9 +22,19 @@ class ActiveRepo < Repo
   end
 
   def up
-    @old_sha = current_sha
+    old_sha = current_sha
     yield
-    @new_sha = current_sha
+
+    set_files_changed(old_sha)
+  end
+
+  def set_files_changed(old_sha)
+    shell.notify "\nIdentifying changed files:"
+    @files_changed = (shell.run "git diff --name-only #{old_sha}").split("\n")
+  end
+
+  def files_changed
+    @files_changed
   end
 
   def pull_origin_master!

data/lib/bundle_manager.rb

@@ -7,6 +7,7 @@ class BundleManager
   end
 
   def bundle_where_necessary
+    shell.notify "\nBundling:"
     find("Gemfile.lock").each do |gemfile_lock|
       if repo.changed?(gemfile_lock)
         bundle(directory_of(gemfile_lock))

data/lib/lazy_repo.rb

@@ -2,8 +2,17 @@ require_relative 'repo'
 
 class LazyRepo < Repo
 
+  def initialize(*args)
+    super
+    set_all_files
+  end
+
   def files_changed
-    all_files
+    @all_files
   end
 
+  def set_all_files
+    shell.notify "\nIdentifying all files:"
+    @all_files = shell.run("git ls-tree --full-tree -r HEAD --name-only").split("\n")
+  end
 end

data/lib/migrator.rb

@@ -10,6 +10,7 @@ class Migrator
   end
 
   def migrate_where_necessary
+    shell.notify "\nMigrating:"
     directories_to_migrate.each do |dir|
       shell.run "bundle exec rake db:migrate", dir: dir
       shell.run "RAILS_ENV=test bundle exec rake db:migrate", dir: dir

data/lib/repo.rb

@@ -10,17 +10,11 @@ class Repo
     @shell = shell
   end
 
-  def files_changed
-    @files_changed ||= (shell.run "git diff --name-only #{@old_sha}").split("\n")
-  end
 
   def changed?(file_path)
     files_changed.include? file_path
   end
 
-  def all_files
-    @all_files ||= shell.run("git ls-tree --full-tree -r HEAD --name-only").split("\n")
-  end
 
   def find_files(pattern)
     shell.run("git ls-files '*#{pattern}*'").split("\n")

data/lib/upper.rb

@@ -55,6 +55,7 @@ class Upper
   end
 
   def no_git
+    env[:shell].notify "\nBundling and migrating all apps/engines:"
     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.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -85,3 +85,4 @@ signing_key:
 specification_version: 4
 summary: Easily update your rails app and run tests from command line
 test_files: []
+has_rdoc: