oban 0.1.4 → 0.1.5

data/bin/oban

@@ -4,4 +4,15 @@ require 'oban'
 require 'oban/colorify'
 
 oban = Oban.new
-oban.push
+
+if ARGV[0].nil? then
+  oban.show_help
+else
+  arg = ARGV[0]
+  case arg
+    when "--help" then oban.show_help
+    when "deploy" then oban.deploy
+    when "rollback" then oban.rollback
+    when "push" then oban.push
+  end 
+end

data/lib/oban/oban.rb

@@ -8,8 +8,11 @@ class Oban
   attr_accessor :submods  # TODO: should be a list eventually
 
   def initialize
-
     set_config
+  end
+
+  def real_init
+    check_for_clean
 
     # grab config for current repository (based on github)
     current = `git remote show origin | grep Fetch`
@@ -36,9 +39,59 @@ class Oban
 
     self.heroku_remote = remote
 
+    set_remotes
+
     set_submods
 
-    puts colorBlue("using #{heroku_remote}")
+  end
+
+  # show help message
+  def show_help
+    puts colorBlue("oban v??")
+    puts colorBlue("homepage: http://github.com/feydr/oban")
+    puts colorBlue("clone: git@github.com:feydr/oban.git")
+    puts colorBlue("\r" + "-"*20)
+    puts colorBlue("\tCommands:")
+    puts colorBlue("\t--help\tthis listing")
+    puts colorBlue("\tdeploy\tdeploy the local repository")
+    puts colorBlue("\trollback\trollback the local repository")
+    exit
+  end
+
+  # check for any uncommitted changes and bail if found
+  def check_for_clean
+    # can't believe there's not a simple yes/no here..
+    out = `git status --porcelain`
+
+    unless out.empty? then
+      puts colorRed("you have uncommitted changes -- please commit and try again:\r\t#{out}")
+      exit
+    end
+
+  end
+
+  def set_remotes
+    # only add remotes if necessary
+    remotes = `git remote`
+
+    if remotes.match('heroku').nil? then
+      `git remote add heroku #{self.heroku_remote}`
+    end
+  end
+
+  # checkout deploy - 1 branch from github and push to heroku
+  def rollback
+    puts colorBlue('rolling back to commit blah')
+  end
+
+  # ensure that our submodule is reset
+  def reinit_submods
+    # add back in our submodules
+    `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
 
   def set_config
@@ -70,12 +123,11 @@ class Oban
 
     if !submods.empty?
       self.submods = submods.split[1]
-    
-      puts colorBlue("found submodule: #{self.submods}")
     end
 
   end
 
+  # remove all mention of submodules but leave the data in
   def rm_submods
     # rm git modules
     `rm -rf .gitmodules`
@@ -86,19 +138,22 @@ class Oban
     `git rm --cached #{self.submods}`
   end
 
+  # add in submod data
   def add_submod_data
     `git add #{self.submods}`
   end
 
-  def push
+  def deploy
+
+    real_init
+
     # switch to master before anything else
     `git checkout master`
 
     puts colorBlue('deploying')
 
-    # make sure we have config/s3.yml
-    # make sure we have config/mongo.yml
-    # make sure we have config/database.yml
+    # might need to change the logic on this to do reset --hard and
+    # friends so we don't clobber the remote deploy branch
 
     # test to see if deploy exists.. wipe it if it does..
     branches = `git branch`
@@ -116,25 +171,19 @@ class Oban
       add_submod_data
     end
 
-    # only add remotes if necessary
-    remotes = `git remote`
+    `git commit -a -m "deploying"`
 
-    if remotes.match('heroku').nil? then
-      `git remote add heroku #{self.heroku_remote}`
-    end
+    # push to deploy branch first
+    `git push origin +deploy`
 
-    `git commit -a -m "deploying"`
     # btw --force should NEVER be used (except for this case) ;)
     `git push --force heroku HEAD:master`
 
     # add back in our submodules
     puts colorBlue('switching back to master')
     `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`
+    reinit_submods
 
   end
 

data/lib/oban/version.rb

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

metadata

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