herokuise 0.8.3 → 0.9

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('herokuise', '0.8.3') do |p|
+Echoe.new('herokuise', '0.9') do |p|
   p.description    = "automate getting a site on heroku and git"
   p.url            = "http://github.com/orta/herokuise"
   p.author         = "orta therox"

data/bin/herokuise

@@ -1,52 +1,83 @@
 #!/usr/bin/env ruby
 require 'open-uri'
+require 'optparse'
+require 'net/http'
+require 'uri'
+
+# so you can tell the difference between herokuise and general output
+def log(bit)
+  puts "\033[35m#{bit} \033[0m"
+end
+
+options = {}
+ARGV << "-h" if ARGV.empty?
+
+optparse = OptionParser.new do|opts|
+  opts.banner = "Usage: herokuise [project_name] [options] this will create a github repo and set up a sinatra app serving static content on heroku"
+
+  options[:nogithub] = false
+  opts.on( '-ng', '--no-github', 'Don\'t create a github repository' ) do
+    options[:nogithub] = true
+  end
+
+  opts.on( '-h', '--help', 'Display this screen' ) do
+    puts opts
+    exit
+  end
+end
+
+optparse.parse!
 
 appname = ARGV[0]
- if !appname
-  puts" Usage: herokuise [appname] - this will create a github repo and set up a sinatra app serving static content on heroku"
+if !appname
+  log opts
   appname = "nellbot"
   Process.exit
 end
 
 github_user = `git config --global  github.user`
 if github_user == ""
-  puts "You need to set up your github gem username/password, type in"
-  puts "  ->  github config"
+  log "You need to set up your github gem username/password, type in"
+  log "  ->  github config"
   Process.exit
 end
 
-begin
-  if open("http://#{appname}.heroku.com/", "User-Agent" => "Ruby/#{RUBY_VERSION}").include? "No such app"
-    puts "Heroku app http://#{appname}.heroku.com already exists"
-    Process.exit
-  end
-rescue
-
+# test for the heroku app existing already
+page = Net::HTTP.get( URI.parse("http://#{appname}.heroku.com/") ).to_s
+if !page.include? "No such app"
+  log "Heroku app http://#{appname}.heroku.com already exists"
+  Process.exit
 end
 
+
 #kill the old folder if it exists
 if File.exists? appname
   `rm -r #{appname}`
 end
 
-puts "Creating #{appname}"
-
-puts "Creating Github repo"
+log ""
+log "Herokuising ------------"
+log ""
+log "Creating #{appname}"
 
-#this makes the appname folder for us
-`github create #{appname}`
-#`mkdir #{appname}`
 
-puts "Making folders"
+if options[:nogithub] == false
+  log "Creating Github repo"
+  `github create #{appname}`
+else
+  log "Creating folder and repo"
+  `mkdir #{appname}`  
+  `git init #{appname}`
+end
 
+log "Making folders"
 Dir.mkdir appname + "/public"
 
-puts "Making Files"
-
+log "Making Files"
 `echo "sinatra" > #{appname}/.gems`
 
 `echo "require 'app' 
-  run Sinatra::Application" >  #{appname}/config.ru`
+run Sinatra::Application" >  #{appname}/config.ru`
 
 `echo "require 'rubygems' 
 require 'sinatra' 
@@ -55,33 +86,37 @@ get '/' do
   redirect '/index.html' 
 end" > #{appname}/app.rb`
 
-puts "Pulling down Paul Irish's HTML5 Boilerplate code"
 
-# let's work with a good start.
+log "Pulling down Paul Irish's HTML5 Boilerplate code"
 `git clone http://github.com/paulirish/html5-boilerplate.git #{appname}/public`
 
 # and not get any git issues
 `rm -rf #{appname}/public/.git`
 
+# the images folder in the boilerplate has a .gitignore
+# that often confuses me
+`find . -name .gitignore -exec rm {} \;`
+
 #switch to the new app directory
 Dir.chdir( appname )
 
-puts "Commiting to Github"
+log "Commiting to Github"
 
 `git add .`
 `git add .gems`
 
 `git commit -m "initial import from orta-herokuize"`
 
-puts "Pushing to Github"
-
-`git push`
+if options[:nogithub] == false
+  log "Pushing to Github"
+  `git push`
+end
 
-puts "Creating heroku repo"
+log "Creating heroku repo"
 
 `heroku create #{appname}`
 
-puts "Pushing to Heroku"
+log "Pushing to Heroku"
 
 `git push heroku master`
 

data/herokuise.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{herokuise}
-  s.version = "0.8.3"
+  s.version = "0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["orta therox"]
-  s.date = %q{2010-09-05}
+  s.date = %q{2011-03-04}
   s.default_executable = %q{herokuise}
   s.description = %q{automate getting a site on heroku and git}
   s.email = %q{orta.therox@gmail.com}

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: herokuise
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 3
-  version: 0.8.3
+  - 9
+  version: "0.9"
 platform: ruby
 authors: 
 - orta therox
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 +01:00
+date: 2011-03-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency