sfb_scripts 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63037a35b8555aa27cdc4ebf8c69c6f1c601fee1
-  data.tar.gz: a332d1edad8d74ed313db45b51377d024802c538
+  metadata.gz: 51e26558ffa44abae64a37e623586c78015ff3eb
+  data.tar.gz: 1d72a0dce0e76e1a2af590d9178065c349396d2d
 SHA512:
-  metadata.gz: f5c9db6e9da834cb63d7ccfe53632de62afeb4c7a88168a633b899af04d95542b8c5fa2940f528a5d161374d21f3513395114744b3e8e8b27df5752f68890ce2
-  data.tar.gz: 904ed7af26e0d873a823d11186c23728ce74c5d67875c1978cec0d871d1e5afb503e1bbf5f15c9071642317975d9a56bcd852fa8afeda079e921d29099384356
+  metadata.gz: 554114b6d746e2c08676b8966860b70a58e3fa1f0b45b75257d1ed65822832804024d13f33e86ac6f01df83261aed33aba85622e35fc8f591e2284fffc180820
+  data.tar.gz: 7fc7190c9a20ca6db0209361398d673d39befba8526424e6bcade8ea3402782d30f6755a83d74c064faf873f8d4f5d839ffbf8a7968c4d32e8836cfcdf246680

data/bin/app_up

@@ -9,7 +9,7 @@ class CLI < Thor
   # REBASE
   #
 
-  desc "rebase", "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/up.log)'
   option :all, :type => :boolean, :desc => "Don't update the repo, just bundle and migrate everywhere."
 

data/lib/migrator.rb

@@ -8,8 +8,9 @@ class Migrator
 
   def migrate_where_necessary
     directories_to_migrate.each do |dir|
-      shell.run "bundle exec rake db:create db:migrate", dir: dir
-      shell.run "RAILS_ENV=test bundle exec rake db:create db:migrate", dir: dir
+      begin
+        shell.run "bundle exec rake db:migrate", dir: dir
+        shell.run "RAILS_ENV=test bundle exec rake db:migrate", dir: dir
     end
   end
 
@@ -22,7 +23,7 @@ class Migrator
 
   def in_rack_application?(migrate_dir)
     root_dir = migrate_dir.gsub(/db\/migrate$/, '')
-    File.file?("#{root_dir}/config.ru")
+    true
   end
 
 end

data/lib/test_case.rb

@@ -11,14 +11,14 @@ class TestCase
   def working_dir
     @working_dir ||=
       if full_path.match(/^(.*)test\//)
-        "#{full_path.match(/^(.*)test\//)[1]}"
+        "./#{full_path.match(/^(.*)test\//)[1]}"
       else
         raise TestDirectoryError.new("Can't find test's working directory")
       end
   end
 
   def relative_path
-    @relative_path ||= full_path.gsub(/^#{working_dir}/, '') || raise_file_path_error
+    @relative_path ||= full_path.gsub(/^#{working_dir.gsub(/^\.\//, '')}/, '') || raise_file_path_error
   end
 
   def raise_file_path_error

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: sfb_scripts
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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'
 description: Easily update your rails app and run tests from command line
@@ -70,12 +70,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: []
@@ -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: