heroku-multi 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/heroku-multi

@@ -5,13 +5,15 @@ require 'yaml'
 require 'heroku-multi'
 
 flag = HerokuMulti.flags
-cred_location = "#{`echo $HOME`.strip}/.heroku/credentials"
-conf_location = "#{`echo $HOME`.strip}/.heroku/multi.yml"
+Home = `echo $HOME`.strip
+CredLocation = "#{Home}/.heroku/credentials"
+ConfLocation = "#{Home}/.heroku/multi.yml"
+KeyLocation = "#{Home}/.ssh/id_rsa.pub"
 
-if File.exists?(cred_location)
-  cred = File.open(cred_location, 'r').readlines.map{|line| line.strip}
+if File.exists?(CredLocation)
+  cred = File.open(CredLocation, 'r').readlines.map{|line| line.strip}
 
-  unless File.exists?(conf_location)
+  unless File.exists?(ConfLocation)
     default_conf = [
       {
         :name => 'default',
@@ -20,26 +22,27 @@ if File.exists?(cred_location)
       }
     ]
     
-    File.open(conf_location, 'w+') do |conf|
+    File.open(ConfLocation, 'w+') do |conf|
       conf.puts default_conf.to_yaml
     end
   end
 
-  confs = YAML.load(File.open(conf_location, 'r').read)
+  confs = YAML.load(File.open(ConfLocation, 'r').read)
   
   if flag.u?
     if conf = confs.find{|conf| flag.u == conf[:name] or flag.u == conf[:email]}
-      puts "clearing SSH keys"
-      `heroku keys:clear`
+      key_name = File.open(KeyLocation, 'r').read.match(/[^ ]+$/)[0].strip
+      puts "clearing SSH keys #{key_name}"
+      `heroku keys:remove #{key_name}`
 
       puts "rewriting credentials"
-      File.open(cred_location, 'w+') do |cred_file|
+      File.open(CredLocation, 'w+') do |cred_file|
         cred_file.puts conf[:email]
         cred_file.puts conf[:password]
       end
 
       puts "uploading SSH keys"
-      `heroku keys:add #{`echo $HOME`.strip}/.ssh/id_rsa.pub`
+      `heroku keys:add #{KeyLocation}`
 
       puts "Switched user to \"#{conf[:email]}\""
     else

data/heroku-multi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{heroku-multi}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Wyrosdick"]
-  s.date = %q{2010-04-16}
+  s.date = %q{2010-04-24}
   s.default_executable = %q{heroku-multi}
   s.description = %q{Niceities for managing multiple heroku accounts. It uploads SSH keys and replaces credentials}
   s.email = %q{ben@commonthread.com}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ben Wyrosdick
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -05:00
+date: 2010-04-24 00:00:00 -05:00
 default_executable: heroku-multi
 dependencies: 
 - !ruby/object:Gem::Dependency