sfb_scripts 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3d6009dbd443b1c3afcf0e214ecf245ceae4f49
-  data.tar.gz: 9f67a07cc0cb014d5b50456536746fce0f3aa16e
+  metadata.gz: 3ad64628594616c16074cdf1dc8a025a2d788778
+  data.tar.gz: 48f17df97550e050c646e3c15cae131a14a07a1c
 SHA512:
-  metadata.gz: a6df2ec87740289436c430aaf8f425f3d4ea4c31411ceadb9a43d50d583134c18b9b65ec80ec461c57c373e402b633f657c038d6fc3768774ceda2dcd29e90a1
-  data.tar.gz: 809299b62276b552ba6ffaf310eea2cc91f1e2fc10575aa1f3874f33bdb4b3dbf578f5df1289eebf2dcab6c469fbd696a28e0083c25897eeed961c866ecaf8d0
+  metadata.gz: 66862b0679ce60cd59bd4075627014fe2cc9c13228ce18c6e6d956687d757a7c067353287553917d5a688e39da8e133a82e959ffc85fd43ac96efae16b190377
+  data.tar.gz: 0df73ca2bf1cb38a5444ff17ce152504d628bc2c3ee4466af52586f65b46064428120bac50e9a53bee22446bec0f745762512bc2b8d3beb116d11a6e8c652e6d

data/bin/app_up

@@ -9,12 +9,12 @@ class CLI < Thor
   # REBASE
   #
 
-  desc "app_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."
   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"
+  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"
 
-  def app_up
+  def 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 :app_up
+  default_task :up
 end
 
 CLI.start(ARGV)

data/lib/sfb_scripts/bundler/bundle_manager.rb

@@ -1,24 +1,25 @@
 class BundleManager
-  attr_accessor :shell, :repo, :queue
+  attr_accessor :shell, :repo, :queue, :folder_guard
 
-  def initialize(repo: raise, shell: raise)
+  def initialize(repo: raise, shell: raise, queue: raise, folder_guard: folder_guard)
     @shell = shell
     @repo = repo
-    @queue = WorkQueue.new(2, nil)
+    @queue = queue
+    @folder_guard = folder_guard
   end
 
   def bundle_where_necessary
     shell.notify "\nBundling:"
-    find("Gemfile.lock").each do |gemfile_lock|
-      if repo.changed?(gemfile_lock)
-        queue.enqueue_b do
-          bundle(directory_of(gemfile_lock))
-        end
+    directories_to_bundle.each do |dir|
+      queue.enqueue_b do
+        bundle(dir)
       end
     end
     queue.join
   end
 
+  private
+
   def bundle(gemfile_directory)
     begin
       shell.run "bundle install --local", dir: gemfile_directory
@@ -28,6 +29,25 @@ class BundleManager
     end
   end
 
+  def directories_to_bundle
+    changed_gemfile_locks.map do |gemfile_lock|
+      directory_of(gemfile_lock)
+    end
+    .select do |dir|
+      folder_guard.allowed?(dir)
+    end
+  end
+
+  def changed_gemfile_locks
+    all_gemfile_locks.select do |gemfile_lock|
+      repo.changed?(gemfile_lock)
+    end
+  end
+
+  def all_gemfile_locks
+    find("Gemfile.lock")
+  end
+
   def find(file_name)
     Dir.glob("**/#{file_name}")
   end

data/lib/sfb_scripts/folder_guard.rb

@@ -0,0 +1,11 @@
+class FolderGuard
+
+  attr_reader :denied_matches
+  def initialize(denied_matches)
+    @denied_matches = denied_matches
+  end
+
+  def allowed?(folder)
+    denied_matches.select { |d| folder.match(d) }.empty?
+  end
+end

data/lib/sfb_scripts/migrations/migrator.rb

@@ -1,14 +1,13 @@
 class Migrator
-  attr_accessor :shell, :repo, :queue
+  attr_accessor :shell, :repo, :queue, :folder_guard
 
   # hack: move engines flag into
   # another object that decides
-  def initialize(repo: raise, shell: raise, migrate_engines: raise)
+  def initialize(repo: raise, shell: raise, queue: raise, folder_guard: raise)
     @shell = shell
     @repo = repo
-    @migrate_engines = migrate_engines
-    # should be passed in
-    @queue = WorkQueue.new(8, nil)
+    @queue = queue
+    @folder_guard = folder_guard
   end
 
   def migrate_where_necessary
@@ -23,7 +22,7 @@ class Migrator
 
   def directories_to_migrate
     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) };
+    migrate_dirs.select {|d| folder_guard.allowed?(d) };
   end
 
   private
@@ -38,14 +37,7 @@ class Migrator
   end
 
   def in_rack_application?(migrate_dir)
-    if migrate_engines?
-      true
-    else
-      ! migrate_dir.match(/engines/)
-    end
+    folder_guard.allowed?(migrate_dir)
   end
 
-  def migrate_engines?
-    @migrate_engines
-  end
 end

data/lib/sfb_scripts/needs_manager.rb

@@ -16,10 +16,14 @@ 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'
 
 
 class NeedsManager
 
+  BUNDLER_MAX_THREAD_COUNT = 2
+  MIGRATOR_MAX_THREAD_COUNT = 8
+
   def self.configure(task, needs, options)
     new(task, needs, options).configure
   end
@@ -36,6 +40,8 @@ class NeedsManager
     set_working_directory
 
     create_shell
+    create_folder_guard
+
     create_repo if needs.include? :repo
     create_bundler if needs.include? :bundler
     create_migrator if needs.include? :migrator
@@ -61,6 +67,12 @@ class NeedsManager
     end
   end
 
+  def create_folder_guard
+    denied_folders = []
+    denied_folders << 'engines' if ! options[:engines]
+    env[:folder_guard] = FolderGuard.new(denied_folders)
+  end
+
   def create_repo
     env[:repo] = repo_class.new(shell: env[:shell])
   end
@@ -76,11 +88,13 @@ class NeedsManager
   end
 
   def create_bundler
-    env[:bundler] = BundleManager.new(shell: env[:shell], repo: env[:repo])
+    queue = WorkQueue.new(BUNDLER_MAX_THREAD_COUNT, nil)
+    env[:bundler] = BundleManager.new(shell: env[:shell], repo: env[:repo], queue: queue, folder_guard: env[:folder_guard])
   end
 
   def create_migrator
-    env[:migrator] = Migrator.new(shell: env[:shell], repo: env[:repo], migrate_engines: ! options[:no_engines])
+    queue = WorkQueue.new(MIGRATOR_MAX_THREAD_COUNT, nil)
+    env[:migrator] = Migrator.new(shell: env[:shell], repo: env[:repo], queue: queue, folder_guard: env[:folder_guard])
   end
 
   def create_test_runner

data/lib/sfb_scripts/upper.rb

@@ -53,7 +53,7 @@ class Upper
   end
 
   def no_git
-    env[:shell].notify "\nBundling and migrating all apps/engines:"
+    env[:shell].notify "\nBundling and migrating without checking diffs:"
     bundler.bundle_where_necessary
     migrator.migrate_where_necessary
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfb_scripts
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Pete Kinnecom
@@ -14,40 +14,40 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: work_queue
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Easily update your rails app and run tests from command line
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/sfb_scripts/bundler/bundle_manager.rb
+- lib/sfb_scripts/folder_guard.rb
 - lib/sfb_scripts/hook_manager.rb
 - lib/sfb_scripts/hooks/pre_push_hook.rb
 - lib/sfb_scripts/migrations/migrator.rb
@@ -90,12 +91,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -105,4 +106,3 @@ signing_key:
 specification_version: 4
 summary: Easily update your rails app and run tests from command line
 test_files: []
-has_rdoc: