tddium-preview 0.5.0 → 0.5.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tddium-preview (0.1.5)
+    tddium-preview (0.5.0)
       bundler
       highline
       json

data/lib/tddium.rb

@@ -33,12 +33,13 @@ class Tddium < Thor
   method_option :email, :type => :string, :default => nil
   method_option :password, :type => :string, :default => nil
   method_option :ssh_key_file, :type => :string, :default => nil
+  method_option :app, :type => :string, :default => nil
   def account
     set_default_environment(options[:environment])
     if user_details = user_logged_in?
       # User is already logged in, so just display the info
       show_user_details(user_details)
-    elsif heroku_config = HerokuConfig.read_config
+    elsif heroku_config = HerokuConfig.read_config(options[:app])
       # User has logged in to heroku, and TDDIUM environment variables are
       # present
       handle_heroku_user(options, heroku_config)
@@ -429,7 +430,7 @@ class Tddium < Thor
     if user && user["user"]["heroku_needs_activation"] != true
       say Text::Status::HEROKU_CONFIG
     elsif user
-      say Text::Process::HEROKU_WELCOME
+      say Text::Process::HEROKU_WELCOME % heroku_config['TDDIUM_USER_NAME']
       params = get_user_credentials(:email => heroku_config['TDDIUM_USER_NAME'])
       params.delete(:email)
       params[:password_confirmation] = HighLine.ask(Text::Prompt::PASSWORD_CONFIRMATION) { |q| q.echo = "*" }

data/lib/tddium/constant.rb

@@ -94,6 +94,8 @@ tddium spec
       HEROKU_WELCOME = "
 Thanks for installing the Tddium Heroku Add-On!
 
+Your tddium username is: %s
+
 Next, set a password and provide an SSH key to authenticate your communication
 with Tddium.
 

data/lib/tddium/heroku.rb

@@ -3,11 +3,14 @@ Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
 class HerokuConfig
-  def self.read_config
+  REQUIRED_KEYS = %w{TDDIUM_API_KEY TDDIUM_USER_NAME}
+  def self.read_config(app=nil)
     result = nil
     begin
       config = {}
-      output = `heroku config -s`
+      command = "heroku config -s"
+      command += " --app #{app}" if app
+      output = `#{command}`
       output.lines.each do |line|
         line.chomp!
         k, v = line.split('=')
@@ -15,6 +18,7 @@ class HerokuConfig
           config[k] = v
         end
       end
+      return nil if REQUIRED_KEYS.inject(false) {|missing, x| !config[x]}
       result = config if config.keys.length > 0
     rescue Errno::ENOENT
     rescue Errno::EPERM

data/lib/tddium/version.rb

@@ -3,5 +3,5 @@ Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
 module TddiumVersion
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/heroku_spec.rb

@@ -7,9 +7,13 @@ require "rspec"
 require "tddium/heroku"
 
 describe HerokuConfig do
+  SAMPLE_APP = "testapp"
   SAMPLE_HEROKU_CONFIG_TDDIUM = "
 TDDIUM_API_KEY=abcdefg
 TDDIUM_USER_NAME=app1234@heroku.com
+"
+  SAMPLE_HEROKU_CONFIG_PARTIAL = "
+TDDIUM_API_KEY=abcdefg
 "
   SAMPLE_HEROKU_CONFIG_NO_TDDIUM = "
 DB_URL=postgres://foo/bar
@@ -32,6 +36,28 @@ DB_URL=postgres://foo/bar
       end
     end
 
+    context "with app specified" do
+      before do
+        HerokuConfig.stub(:`).with("heroku config -s --app #{SAMPLE_APP}").and_return(SAMPLE_HEROKU_CONFIG_TDDIUM)
+        HerokuConfig.should_receive(:`).with("heroku config -s --app #{SAMPLE_APP}")
+      end
+
+      it "should pass the app to heroku config" do
+        result = HerokuConfig.read_config(SAMPLE_APP)
+        result.should_not be_nil
+      end
+    end
+
+    context "missing config" do
+      before do
+        HerokuConfig.stub(:`).with("heroku config -s").and_return(SAMPLE_HEROKU_CONFIG_PARTIAL)
+      end
+
+      it "should return nil" do
+        HerokuConfig.read_config.should be_nil
+      end
+    end
+
     context "addon not installed" do
       before do
         HerokuConfig.stub(:`).with("heroku config -s").and_return(SAMPLE_HEROKU_CONFIG_NO_TDDIUM)

data/spec/tddium_spec.rb

@@ -536,7 +536,7 @@ describe Tddium do
           it_behaves_like "prompt for ssh key"
 
           it "should display the heroku welcome" do
-            tddium.should_receive(:say).with(Tddium::Text::Process::HEROKU_WELCOME)
+            tddium.should_receive(:say).with(Tddium::Text::Process::HEROKU_WELCOME % SAMPLE_EMAIL)
             run_account(tddium)
           end
 

metadata

@@ -2,7 +2,7 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 -07:00
+date: 2011-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency