shelly 0.0.7 → 0.0.8

data/lib/shelly/app.rb

@@ -4,20 +4,43 @@ require 'launchy'
 module Shelly
   class App < Base
     DATABASE_KINDS = %w(postgresql mongodb redis none)
-    attr_accessor :purpose, :code_name, :databases
+    attr_accessor :purpose, :code_name, :databases, :ruby_version, :environment
+
+    def initialize
+      @ruby_version = "MRI-1.9.2"
+    end
 
     def add_git_remote
-      system("git remote add #{purpose} git@git.shellycloud.com:#{code_name}.git")
+      system("git remote add #{purpose} #{git_url}")
+    end
+
+    def git_url
+      "git@git.shellycloud.com:#{code_name}.git"
     end
 
     def generate_cloudfile
       @email = current_user.email
       @databases = databases
-      template = File.read("lib/shelly/templates/Cloudfile.erb")
+      template = File.read(cloudfile_template_path)
       cloudfile = ERB.new(template, 0, "%<>-")
       cloudfile.result(binding)
     end
 
+    def cloudfile_template_path
+      File.join(File.dirname(__FILE__), "templates", "Cloudfile.erb")
+    end
+
+    def create
+      attributes = {
+        :name         => code_name,
+        :code_name    => code_name,
+        :environment  => purpose,
+        :ruby_version => ruby_version,
+        :domain_name  => "#{code_name}.shellycloud.com"
+      }
+      shelly.create_app(attributes)
+    end
+
     def create_cloudfile
       content = generate_cloudfile
       File.open(cloudfile_path, "a+") { |f| f << content }

data/lib/shelly/cli/apps.rb

@@ -3,6 +3,7 @@ require "shelly/app"
 module Shelly
   module CLI
     class Apps < Thor
+      include Helpers
       namespace :apps
 
       desc "add", "Adds new application to Shelly Cloud"
@@ -11,19 +12,23 @@ module Shelly
         @app.purpose = ask_for_purpose
         @app.code_name = ask_for_code_name
         @app.databases = ask_for_databases
+        @app.create
+        say "Adding remote #{@app.purpose} #{@app.git_url}", :green
         @app.add_git_remote
+        say "Creating Cloudfile", :green
         @app.create_cloudfile
-        open_billing_page
+        say "Provide billing details. Opening browser...", :green
+        @app.open_billing_page
         info_adding_cloudfile_to_repository
         info_deploying_to_shellycloud
+      rescue Client::APIError => e
+        if e.message == "Validation Failed"
+          e.errors.each { |error| say "#{error.first} #{error.last}" }
+          exit 1
+        end
       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
@@ -49,18 +54,21 @@ module Shelly
         end
 
         def info_adding_cloudfile_to_repository
-          say("Project is now configured for use with Shell Cloud:")
-          say("You can review changes using")
-          say("  git diff")
+          say_new_line
+          say "Project is now configured for use with Shell Cloud:", :green
+          say "You can review changes using", :green
+          say "  git diff"
         end
 
         def info_deploying_to_shellycloud
-          say("When you make sure all settings are correct please issue following commands:")
-          say("  git add .")
-          say('  git commit -m "Application added to Shelly Cloud"')
-          say("  git push")
-          say("Deploy to #{@app.purpose} using:")
-          say("  git push #{@app.purpose} master")
+          say_new_line
+          say "When you make sure all settings are correct please issue following commands:", :green
+          say "  git add ."
+          say '  git commit -m "Application added to Shelly Cloud"'
+          say "  git push"
+          say_new_line
+          say "Deploy to #{@app.purpose} using:", :green
+          say "  git push #{@app.purpose} master"
         end
       end
     end

data/lib/shelly/client.rb

@@ -37,6 +37,10 @@ module Shelly
       get("/token")
     end
 
+    def create_app(attributes)
+      post("/apps", :app => attributes)
+    end
+
     def post(path, params = {})
       request(path, :post, params)
     end
@@ -59,7 +63,7 @@ module Shelly
     end
 
     def http_basic_auth_options
-      @email ? {:username => @email, :password => @password} : {}
+      @email ? {:user => @email, :password => @password} : {}
     end
 
     def request_parameters(path, method, params = {})

data/lib/shelly/version.rb

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

data/spec/shelly/app_spec.rb

@@ -5,6 +5,8 @@ describe Shelly::App do
   before do
     FileUtils.mkdir_p("/projects/foo")
     Dir.chdir("/projects/foo")
+    @client = mock(:api_url => "https://api.example.com")
+    Shelly::Client.stub(:new).and_return(@client)
     @app = Shelly::App.new
     @app.purpose = "staging"
     @app.code_name = "foo-staging"
@@ -89,4 +91,25 @@ config
       @app.open_billing_page
     end
   end
+
+  describe "#git_url" do
+    it "should return URL to git repository on shelly" do
+      @app.git_url.should == "git@git.shellycloud.com:foo-staging.git"
+    end
+  end
+
+  describe "#create" do
+    it "should create the app on shelly cloud via API client" do
+      @app.purpose = "dev"
+      @app.code_name = "fooo"
+      @client.should_receive(:create_app).with({
+        :code_name => "fooo",
+        :name => "fooo",
+        :environment => "dev",
+        :ruby_version => "MRI-1.9.2",
+        :domain_name => "fooo.shellycloud.com"
+      })
+      @app.create
+    end
+  end
 end

data/spec/shelly/cli/apps_spec.rb

@@ -14,6 +14,7 @@ describe Shelly::CLI::Apps do
       Dir.chdir("/projects/foo")
       @app = Shelly::App.new
       @app.stub(:add_git_remote)
+      @app.stub(:create)
       @app.stub(:generate_cloudfile).and_return("Example Cloudfile")
       @app.stub(:open_billing_page)
       Shelly::App.stub(:new).and_return(@app)
@@ -64,7 +65,7 @@ describe Shelly::CLI::Apps do
       end
     end
 
-    it "should validate databases" do
+    it "should ask again for databases if unsupported kind typed" do
       $stdout.should_receive(:print).with("Which database do you want to use postgresql, mongodb, redis, none (postgresql - default): ")
       $stdout.should_receive(:print).with("Unknown database kind. Supported are: postgresql, mongodb, redis, none: ")
       fake_stdin(["staging", "", "postgresql,doesnt-exist", "none"]) do
@@ -81,6 +82,25 @@ describe Shelly::CLI::Apps do
       end
     end
 
+    it "should create the app on shelly cloud" do
+      @app.should_receive(:create)
+      fake_stdin(["", "", ""]) do
+        @apps.add
+      end
+    end
+
+    it "should display validation errors if they are any" do
+      response = {"message" => "Validation Failed", "errors" => [["code_name", "has been already taken"]]}
+      exception = Shelly::Client::APIError.new(response)
+      @app.should_receive(:create).and_raise(exception)
+      $stdout.should_receive(:puts).with("code_name has been already taken")
+      lambda {
+        fake_stdin(["", "", ""]) do
+          @apps.add
+        end
+      }.should raise_error(SystemExit)
+    end
+
     it "should add git remote" do
       @app.should_receive(:add_git_remote)
       fake_stdin(["staging", "foooo", ""]) do
@@ -97,7 +117,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...")
+      $stdout.should_receive(:puts).with("\e[32mProvide billing details. Opening browser...\e[0m")
       @app.should_receive(:open_billing_page)
       fake_stdin(["staging", "foooo", ""]) do
         @apps.add
@@ -105,8 +125,8 @@ describe Shelly::CLI::Apps do
     end
 
     it "should display info about adding Cloudfile to repository" do
-      $stdout.should_receive(:puts).with("Project is now configured for use with Shell Cloud:")
-      $stdout.should_receive(:puts).with("You can review changes using")
+      $stdout.should_receive(:puts).with("\e[32mProject is now configured for use with Shell Cloud:\e[0m")
+      $stdout.should_receive(:puts).with("\e[32mYou can review changes using\e[0m")
       $stdout.should_receive(:puts).with("  git diff")
       fake_stdin(["staging", "foooo", "none"]) do
         @apps.add
@@ -114,11 +134,11 @@ describe Shelly::CLI::Apps do
     end
 
     it "should display info on how to deploy to ShellyCloud" do
-      $stdout.should_receive(:puts).with("When you make sure all settings are correct please issue following commands:")
+      $stdout.should_receive(:puts).with("\e[32mWhen you make sure all settings are correct please issue following commands:\e[0m")
       $stdout.should_receive(:puts).with("  git add .")
       $stdout.should_receive(:puts).with('  git commit -m "Application added to Shelly Cloud"')
       $stdout.should_receive(:puts).with("  git push")
-      $stdout.should_receive(:puts).with("Deploy to staging using:")
+      $stdout.should_receive(:puts).with("\e[32mDeploy to staging using:\e[0m")
       $stdout.should_receive(:puts).with("  git push staging master")
       fake_stdin(["staging", "foooo", "none"]) do
         @apps.add

data/spec/shelly/client_spec.rb

@@ -45,14 +45,21 @@ describe Shelly::Client do
     end
   end
 
+  describe "#create_app" do
+    it "should send post with app's attributes" do
+      @client.should_receive(:post).with("/apps", :app => {:code_name => "foo", :ruby_version => "1.9.2"})
+      @client.create_app(:code_name => "foo", :ruby_version => "1.9.2")
+    end
+  end
+
   describe "#request_parameters" do
     it "should return hash of resquest parameters" do
       expected = {
-        :method => :post,
-        :url => "#{@client.api_url}/account",
-        :headers => @client.headers,
-        :payload => {:name => "bob"}.to_json,
-        :username => "bob@example.com",
+        :method   => :post,
+        :url      => "#{@client.api_url}/account",
+        :headers  => @client.headers,
+        :payload  => {:name => "bob"}.to_json,
+        :user     => "bob@example.com",
         :password => "secret"
       }
       @client.request_parameters("/account", :post, :name => "bob").should == expected

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelly
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Shelly Cloud team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 +02:00
+date: 2011-10-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency