shelly 0.0.6 → 0.0.7

data/lib/core_ext/object.rb

@@ -2,4 +2,8 @@ class Object
   def blank?
     respond_to?(:empty?) ? empty? : !self
   end
+
+  def present?
+    not blank?
+  end
 end

data/lib/shelly/base.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module Shelly
   class Base
     def current_user
@@ -6,8 +8,20 @@ module Shelly
       @user
     end
 
+    def config
+      @config ||= if File.exists?(config_file_path)
+        YAML::load(File.read(config_file_path))
+      else
+        {}
+      end
+    end
+
+    def config_file_path
+      File.join(current_user.config_dir, "config.yml")
+    end
+
     def shelly
-      @shelly ||= Client.new(current_user.email, current_user.password)
+      @shelly ||= Client.new(current_user.email, current_user.password, config)
     end
   end
 end

data/lib/shelly/cli/account.rb

@@ -6,26 +6,20 @@ module Shelly
       namespace :account
       include Helpers
 
-      desc "register", "Registers new user account on Shelly Cloud"
-      def register
-        email = ask_for_email
-        password = ask_for_password
-
-        # FIXME: ask user in loop, until he enters valid values
-        if email.blank? or password.blank?
-          say "Email and password can't be blank" and exit 1
-        end
-
-        user = User.new(email, password)
+      desc "register [EMAIL]", "Registers new user account on Shelly Cloud"
+      def register(email = nil)
+        say "Registering with email: #{email}" if email
+        user = User.new(email || ask_for_email, ask_for_password)
         user.register
         if user.ssh_key_exists?
           say "Uploading your public SSH key from #{user.ssh_key_path}"
         end
         say "Successfully registered!"
-        say "Check you mailbox for email confirmation"
+        say "Check you mailbox for email address confirmation"
       rescue Client::APIError => e
         if e.message == "Validation Failed"
           e.errors.each { |error| say "#{error.first} #{error.last}" }
+          exit 1
         end
       end
 
@@ -40,15 +34,26 @@ module Shelly
         def ask_for_email
           email_question = User.guess_email.blank? ? "Email:" : "Email (#{User.guess_email} - default):"
           email = ask(email_question)
-          email.blank? ? User.guess_email : email
+          email = email.blank? ? User.guess_email : email
+          return email if email.present?
+          say_error "Email can't be blank, please try again"
         end
 
         def ask_for_password
-          say "Password: "
-          echo_off
-          password = $stdin.gets.strip
-          echo_on
-          password
+          loop do
+            say "Password: "
+            password = echo_disabled { $stdin.gets.strip }
+            say_new_line
+            say "Password confirmation: "
+            password_confirmation = echo_disabled { $stdin.gets.strip }
+            say_new_line
+            if password.present?
+              return password if password == password_confirmation
+              say "Password and password confirmation don't match, please type them again"
+            else
+              say "Password can't be blank"
+            end
+          end
         end
       end
     end

data/lib/shelly/cli/apps.rb

@@ -13,13 +13,17 @@ module Shelly
         @app.databases = ask_for_databases
         @app.add_git_remote
         @app.create_cloudfile
-        @app.open_billing_page
-
+        open_billing_page
         info_adding_cloudfile_to_repository
         info_deploying_to_shellycloud
       end
 
       no_tasks do
+        def open_billing_page
+          say "Provide billing details. Opening browser..."
+          @app.open_billing_page
+        end
+
         def ask_for_purpose
           purpose = ask("How will you use this system (production - default,staging):")
           purpose.blank? ? "production" : purpose

data/lib/shelly/cli/main.rb

@@ -16,9 +16,9 @@ module Shelly
         say "shelly version #{Shelly::VERSION}"
       end
 
-      desc "register", "Registers new user account on Shelly Cloud"
-      def register
-        invoke "account:register"
+      desc "register [EMAIL]", "Registers new user account on Shelly Cloud"
+      def register(email = nil)
+        invoke "account:register", email
       end
 
       desc "add", "Adds new application to Shelly Cloud"

data/lib/shelly/client.rb

@@ -19,13 +19,14 @@ module Shelly
       end
     end
 
-    def initialize(email = nil, password = nil)
+    def initialize(email = nil, password = nil, options = {})
       @email = email
       @password = password
+      @options = options
     end
 
     def api_url
-      ENV["SHELLY_URL"] || "https://admin.winniecloud.com/apiv2"
+      @options["shelly_url"] || ENV["SHELLY_URL"] || "https://admin.winniecloud.com/apiv2"
     end
 
     def register_user(email, password, ssh_key)

data/lib/shelly/helpers.rb

@@ -1,11 +1,19 @@
 module Shelly
   module Helpers
-    def echo_off
+    def echo_disabled
       system "stty -echo"
+      value = yield
+      system "stty echo"
+      value
     end
 
-    def echo_on
-      system "stty echo"
+    def say_new_line
+      say "\n"
+    end
+
+    def say_error(message)
+      say message
+      exit 1
     end
   end
 end

data/lib/shelly/templates/Cloudfile.erb

@@ -1,5 +1,6 @@
 <%= @code_name %>:
-  ruby: 1.9.2
+  ruby: 1.9.2 # 1.9.2 or ree
+  environment: production # RAILS_ENV
   monitoring_email:
     - <%= @email %>
   domains:
@@ -7,14 +8,12 @@
   servers:
     app1:
       size: large
-      web:
-        type: thin
-        count: 3
-      clock:
-        type: cron
-    <%- @databases.each_with_index do |kind, index| -%>
-    <%= "#{kind}#{index}" %>:
+      thin: 4
+      # whenever: on
+      # delayed_job: 1
+    <%- @databases.each do |kind| -%>
+    <%= kind %>:
       size: large
       database:
-        type: <%= kind %>
+        - <%= kind %>
     <%- end -%>

data/lib/shelly/user.rb

@@ -1,6 +1,7 @@
 module Shelly
   class User < Base
     attr_reader :email, :password
+
     def initialize(email = nil, password = nil)
       @email = email
       @password = password
@@ -39,11 +40,11 @@ module Shelly
       @@guess_email ||= IO.popen("git config --get user.email").read.strip
     end
 
-    protected
-      def config_dir
-        File.expand_path("~/.shelly")
-      end
+    def config_dir
+      File.expand_path("~/.shelly")
+    end
 
+    protected
       def credentials_path
         File.join(config_dir, "credentials")
       end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/shelly/app_spec.rb

@@ -31,7 +31,8 @@ describe Shelly::App do
       FakeFS.deactivate!
       expected = <<-config
 foo-staging:
-  ruby: 1.9.2
+  ruby: 1.9.2 # 1.9.2 or ree
+  environment: production # RAILS_ENV
   monitoring_email:
     - bob@example.com
   domains:
@@ -39,19 +40,17 @@ foo-staging:
   servers:
     app1:
       size: large
-      web:
-        type: thin
-        count: 3
-      clock:
-        type: cron
-    postgresql0:
+      thin: 4
+      # whenever: on
+      # delayed_job: 1
+    postgresql:
       size: large
       database:
-        type: postgresql
-    mongodb1:
+        - postgresql
+    mongodb:
       size: large
       database:
-        type: mongodb
+        - mongodb
 config
       @app.generate_cloudfile.should == expected
     end
@@ -83,7 +82,7 @@ config
 
   describe "#open_billing_page" do
     it "should open browser window" do
-      user = mock(:token => "abc", :email => nil, :password => nil)
+      user = mock(:token => "abc", :email => nil, :password => nil, :config_dir => "~/.shelly")
       @app.stub(:current_user).and_return(user)
       url = "#{@app.shelly.api_url}/apps/foo-staging/edit_billing?api_key=abc"
       Launchy.should_receive(:open).with(url)

data/spec/shelly/base_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe Shelly::Base do
+  before do
+    config_dir = File.expand_path("~/.shelly")
+    FileUtils.mkdir_p(config_dir)
+  end
+
+  describe "#current_user" do
+    it "should return user with loaded credentials" do
+      File.open(File.join("~/.shelly/credentials"), "w") { |f| f << "superman@example.com\nthe-kal-el" }
+      base = Shelly::Base.new
+      user = base.current_user
+      user.email.should == "superman@example.com"
+      user.password.should == "the-kal-el"
+    end
+  end
+
+  describe "#config" do
+    context "config file exists" do
+      it "should return loaded config as a Hash" do
+        File.open("~/.shelly/config.yml", "w") { |f| f << "shelly_url: http://api.example.com/v4/\n" }
+        base = Shelly::Base.new
+        base.config.should == {"shelly_url" => "http://api.example.com/v4/"}
+      end
+    end
+
+    context "config file doesn't exist" do
+      it "should return an empty Hash" do
+        base = Shelly::Base.new
+        base.config.should == {}
+      end
+    end
+  end
+end

data/spec/shelly/cli/account_spec.rb

@@ -18,10 +18,11 @@ describe Shelly::CLI::Account do
       @key_path = File.expand_path("~/.ssh/id_rsa.pub")
     end
 
-    it "should ask for email and password" do
+    it "should ask for email, password and password confirmation" do
       $stdout.should_receive(:print).with("Email: ")
       $stdout.should_receive(:print).with("Password: ")
-      fake_stdin(["better@example.com", "secret"]) do
+      $stdout.should_receive(:print).with("Password confirmation: ")
+      fake_stdin(["better@example.com", "secret", "secret"]) do
         @account.register
       end
     end
@@ -30,77 +31,97 @@ describe Shelly::CLI::Account do
       Shelly::User.stub(:guess_email).and_return("kate@example.com")
       $stdout.should_receive(:print).with("Email (kate@example.com - default): ")
       @client.should_receive(:register_user).with("kate@example.com", "secret", nil)
-      fake_stdin(["", "secret"]) do
+      fake_stdin(["", "secret", "secret"]) do
         @account.register
       end
     end
 
     it "should use email provided by user" do
       @client.should_receive(:register_user).with("better@example.com", "secret", nil)
-      fake_stdin(["better@example.com", "secret"]) do
+      fake_stdin(["better@example.com", "secret", "secret"]) do
         @account.register
       end
     end
 
-    it "should exit with message if email is blank" do
-      Shelly::User.stub(:guess_email).and_return("")
-      $stdout.should_receive(:puts).with("Email and password can't be blank")
-      lambda do
-        fake_stdin(["", "only-pass"]) do
+    it "should not ask about email if it's provided as argument" do
+      $stdout.should_receive(:puts).with("Registering with email: kate@example.com")
+      fake_stdin(["secret", "secret"]) do
+        @account.register("kate@example.com")
+      end
+    end
+
+    context "when user enters blank email" do
+      it "should show error message and exit with 1" do
+        Shelly::User.stub(:guess_email).and_return("")
+        $stdout.should_receive(:puts).with("Email can't be blank, please try again")
+        lambda {
+          fake_stdin(["", "bob@example.com", "only-pass", "only-pass"]) do
+            @account.register
+          end
+        }.should raise_error(SystemExit)
+      end
+    end
+
+    context "when user enters blank password" do
+      it "should ask for it again" do
+        $stdout.should_receive(:puts).with("Password can't be blank")
+        fake_stdin(["better@example.com", "", "", "secret", "secret"]) do
           @account.register
         end
-      end.should raise_error(SystemExit)
+      end
     end
 
-    it "should exit with message if password is blank" do
-      $stdout.should_receive(:puts).with("Email and password can't be blank")
-      lambda do
-        fake_stdin(["better@example.com", ""]) do
+    context "when user enters password and password confirmation which don't match each other" do
+      it "should ask for them again" do
+        $stdout.should_receive(:puts).with("Password and password confirmation don't match, please type them again")
+        fake_stdin(["better@example.com", "secret", "sec-TYPO-ret", "secret", "secret"]) do
           @account.register
         end
-      end.should raise_error(SystemExit)
+      end
     end
 
-    context "ssh key exists" do
-      it "should register with ssh-key" do
+    context "public SSH key exists" do
+      it "should register with the public SSH key" do
         FileUtils.mkdir_p("~/.ssh")
         File.open(@key_path, "w") { |f| f << "key" }
         $stdout.should_receive(:puts).with("Uploading your public SSH key from #{@key_path}")
-        fake_stdin(["kate@example.com", "secret"]) do
+        fake_stdin(["kate@example.com", "secret", "secret"]) do
           @account.register
         end
       end
     end
 
-    context "ssh key doesn't exist" do
-      it "should register user without the ssh key" do
+    context "public SSH key doesn't exist" do
+      it "should register user without the public SSH key" do
         $stdout.should_not_receive(:puts).with("Uploading your public SSH key from #{@key_path}")
-        fake_stdin(["kate@example.com", "secret"]) do
+        fake_stdin(["kate@example.com", "secret", "secret"]) do
           @account.register
         end
       end
     end
 
     context "on successful registration" do
-      it "should display message about registration and email confirmation" do
+      it "should display message about registration and email address confirmation" do
         @client.stub(:register_user).and_return(true)
         $stdout.should_receive(:puts).with("Successfully registered!")
-        $stdout.should_receive(:puts).with("Check you mailbox for email confirmation")
-        fake_stdin(["kate@example.com", "pass"]) do
+        $stdout.should_receive(:puts).with("Check you mailbox for email address confirmation")
+        fake_stdin(["kate@example.com", "pass", "pass"]) do
           @account.register
         end
       end
     end
 
     context "on unsuccessful registration" do
-      it "should display errors" do
+      it "should display errors and exit with 1" do
         response = {"message" => "Validation Failed", "errors" => [["email", "has been already taken"]]}
         exception = Shelly::Client::APIError.new(response)
         @client.stub(:register_user).and_raise(exception)
         $stdout.should_receive(:puts).with("email has been already taken")
-        fake_stdin(["kate@example.com", "pass"]) do
-          @account.register
-        end
+        lambda {
+          fake_stdin(["kate@example.com", "pass", "pass"]) do
+            @account.register
+          end
+        }.should raise_error(SystemExit)
       end
     end
   end

data/spec/shelly/cli/apps_spec.rb

@@ -97,6 +97,7 @@ describe Shelly::CLI::Apps do
     end
 
     it "should browser window with link to edit billing information" do
+      $stdout.should_receive(:puts).with("Provide billing details. Opening browser...")
       @app.should_receive(:open_billing_page)
       fake_stdin(["staging", "foooo", ""]) do
         @apps.add

data/spec/shelly/cli/main_spec.rb

@@ -15,8 +15,8 @@ describe Shelly::CLI::Main do
 
   describe "#register" do
     it "should invoke account:register command" do
-      @main.should_receive(:invoke).with("account:register")
-      @main.register
+      @main.should_receive(:invoke).with("account:register", "kate@example.com")
+      @main.register("kate@example.com")
     end
   end
 
@@ -27,8 +27,6 @@ describe Shelly::CLI::Main do
     end
   end
 
-
-
   describe "#help" do
     it "should display available commands" do
       expected = <<-OUT
@@ -37,7 +35,7 @@ Tasks:
   shelly add                # Adds new application to Shelly Cloud
   shelly apps <command>     # Manages your applications
   shelly help [TASK]        # Describe available tasks or one specific task
-  shelly register           # Registers new user account on Shelly Cloud
+  shelly register [EMAIL]   # Registers new user account on Shelly Cloud
   shelly version            # Displays shelly version
 OUT
       out = IO.popen("bin/shelly").read.strip

data/spec/shelly/client_spec.rb

@@ -8,6 +8,13 @@ describe Shelly::Client do
   end
 
   describe "#api_url" do
+    context "API URL passed with options hash" do
+      it "should use provided value" do
+        client = Shelly::Client.new("bob@example.com", "secret", "shelly_url" => "https://api2.example.com")
+        client.api_url.should == "https://api2.example.com"
+      end
+    end
+
     context "env SHELLY_URL is not set" do
       it "should return default API URL" do
         ENV['SHELLY_URL'].should be_nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelly
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Shelly Cloud team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 +02:00
+date: 2011-10-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,6 +205,7 @@ files:
 - spec/helpers.rb
 - spec/input_faker.rb
 - spec/shelly/app_spec.rb
+- spec/shelly/base_spec.rb
 - spec/shelly/cli/account_spec.rb
 - spec/shelly/cli/apps_spec.rb
 - spec/shelly/cli/main_spec.rb
@@ -249,6 +250,7 @@ test_files:
 - spec/helpers.rb
 - spec/input_faker.rb
 - spec/shelly/app_spec.rb
+- spec/shelly/base_spec.rb
 - spec/shelly/cli/account_spec.rb
 - spec/shelly/cli/apps_spec.rb
 - spec/shelly/cli/main_spec.rb