Merge 074babe into 6c2ad00

petems · Apr 24, 2014 · f02d222 · f02d222
2 parents 6c2ad00 + 074babe
commit f02d222
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/tugboat/config.rb b/lib/tugboat/config.rb
@@ -13,7 +13,7 @@ class Configuration
     DEFAULT_SSH_KEY_PATH = '.ssh/id_rsa'
     DEFAULT_SSH_PORT = '22'
     DEFAULT_REGION = '1'
-    DEFAULT_IMAGE = '350076'
+    DEFAULT_IMAGE = '3240036'
     DEFAULT_SIZE = '66'
     DEFAULT_SSH_KEY = ''
     DEFAULT_PRIVATE_NETWORKING = 'false'

diff --git a/lib/tugboat/middleware/ask_for_credentials.rb b/lib/tugboat/middleware/ask_for_credentials.rb
@@ -15,7 +15,7 @@ def call(env)
         say "Defaults can be changed at any time in your ~/.tugboat configuration file."
         say
         region   = ask "Enter your default region ID (optional, defaults to 1 (New York)):"
-        image    = ask "Enter your default image ID (optional, defaults to 350076 (Ubuntu 13.04 x64)):"
+        image    = ask "Enter your default image ID (optional, defaults to 3240036 (Ubuntu 14.04 x64)):"
         size     = ask "Enter your default size ID (optional, defaults to 66 (512MB)):"
         ssh_key  = ask "Enter your default ssh key ID (optional, defaults to none):"
         private_networking = ask "Enter your default for private networking (optional, defaults to false):"

diff --git a/spec/cli/authorize_cli_spec.rb b/spec/cli/authorize_cli_spec.rb
@@ -26,7 +26,7 @@
       $stdin.should_receive(:gets).and_return(ssh_port)
       $stdout.should_receive(:print).with("Enter your default region ID (optional, defaults to 1 (New York)): ")
       $stdin.should_receive(:gets).and_return(region)
-      $stdout.should_receive(:print).with("Enter your default image ID (optional, defaults to 350076 (Ubuntu 13.04 x64)): ")
+      $stdout.should_receive(:print).with("Enter your default image ID (optional, defaults to 3240036 (Ubuntu 14.04 x64)): ")
       $stdin.should_receive(:gets).and_return(image)
       $stdout.should_receive(:print).with("Enter your default size ID (optional, defaults to 66 (512MB)): ")
       $stdin.should_receive(:gets).and_return(size)
@@ -70,7 +70,7 @@
       $stdin.should_receive(:gets).and_return('')
       $stdout.should_receive(:print).with("Enter your default region ID (optional, defaults to 1 (New York)): ")
       $stdin.should_receive(:gets).and_return('')
-      $stdout.should_receive(:print).with("Enter your default image ID (optional, defaults to 350076 (Ubuntu 13.04 x64)): ")
+      $stdout.should_receive(:print).with("Enter your default image ID (optional, defaults to 3240036 (Ubuntu 14.04 x64)): ")
       $stdin.should_receive(:gets).and_return('')
       $stdout.should_receive(:print).with("Enter your default size ID (optional, defaults to 66 (512MB)): ")
       $stdin.should_receive(:gets).and_return('')
@@ -88,7 +88,7 @@
 
       config = YAML.load_file(tmp_path)
 
-      config["defaults"]["image"].should eq "350076"
+      config["defaults"]["image"].should eq "3240036"
       config["defaults"]["region"].should eq "1"
       config["defaults"]["size"].should eq "66"
       config["ssh"]["ssh_user"].should eq ENV["USER"]