oban 0.1.3 → 0.1.4

data/README.md

@@ -13,3 +13,9 @@ submodules
   me@myhost:~/my_proj$ oban
 
 ####TODO:
+  * be able to deploy in any directory of the project
+  * right now if you have a fairly large repo it can take some time to
+    upload -- I'd like to get rid of the push --force hack and do some
+    intelligent diffing instead
+  * testing!
+  * support for multiple submodules (right now it only does one)

data/lib/oban/oban.rb

@@ -8,15 +8,8 @@ class Oban
   attr_accessor :submods  # TODO: should be a list eventually
 
   def initialize
-    conf_file = ENV['HOME'] + '/.oban.yml'
 
-    unless FileTest.exist?(conf_file)
-      puts colorRed('Missing Conf File!')
-      puts colorRed('\tPlease copy oban.yml.example to ~/.oban.yml and edit')
-      exit
-    end
-
-    self.config = YAML::load(File.open(conf_file) { |f| @stuff = f.read })
+    set_config
 
     # grab config for current repository (based on github)
     current = `git remote show origin | grep Fetch`
@@ -48,6 +41,29 @@ class Oban
     puts colorBlue("using #{heroku_remote}")
   end
 
+  def set_config
+    home_conf_file = ENV['HOME'] + '/.oban.yml'
+    cwd_conf_file = '.oban.yml'
+
+    g2g = false
+
+    if FileTest.exist?(home_conf_file) then
+      self.config = YAML::load(File.open(home_conf_file) { |f| @stuff = f.read })
+      g2g = true
+    end
+
+    if FileTest.exist?(cwd_conf_file) then
+      self.config = YAML::load(File.open(cwd_conf_file) { |f| @stuff = f.read })
+      g2g = true
+    end
+
+    unless g2g
+      puts colorRed("Missing Conf File!")
+      puts colorRed("\tPlease copy oban.yml.example to ~/.oban.yml or project_root and edit")
+      exit
+    end
+  end
+
   # only supports one right now -- FIXME
   def set_submods
     submods = `git submodule status`
@@ -116,6 +132,10 @@ class Oban
     `git checkout master`
     `git submodule init`
     `git submodule update`
+
+    # ensure we checkout master (cause it'll default to headless)
+    `git --git-dir=#{self.submods}/.git checkout master`
+
   end
 
 end

data/lib/oban/version.rb

@@ -1,3 +1,3 @@
 module Oban
-  VERSION = "0.1.3" unless defined?(::Oban::VERSION)
+  VERSION = "0.1.4" unless defined?(::Oban::VERSION)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oban
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Ian Eyberg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -05:00
+date: 2010-10-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency