shelly 0.0.21.pre5 → 0.0.21

data/lib/shelly/app.rb

@@ -4,9 +4,12 @@ require 'launchy'
 module Shelly
   class App < Model
     DATABASE_KINDS = %w(postgresql mongodb redis none)
+    attr_accessor :code_name, :databases, :ruby_version, :environment, :git_url, :domains
 
-    attr_accessor :code_name, :databases, :ruby_version, :environment,
-      :git_url, :domains
+    def initialize
+      @ruby_version = "MRI-1.9.2"
+      @environment = "production"
+    end
 
     def add_git_remote
       system("git remote rm production > /dev/null 2>&1")
@@ -15,6 +18,8 @@ module Shelly
 
     def generate_cloudfile
       @email = current_user.email
+      @databases = databases
+      @domains = domains
       template = File.read(cloudfile_template_path)
       cloudfile = ERB.new(template, 0, "%<>-")
       cloudfile.result(binding)
@@ -25,12 +30,16 @@ module Shelly
     end
 
     def create
-      attributes = {:name => code_name, :code_name => code_name, :domains => domains}
+      attributes = {
+        :name         => code_name,
+        :code_name    => code_name,
+        :environment  => environment,
+        :ruby_version => ruby_version,
+        :domain_name  => domains ? domains.join(" ") : nil
+      }
       response = shelly.create_app(attributes)
       self.git_url = response["git_url"]
-      self.domains = response["domains"]
-      self.ruby_version = response["ruby_version"]
-      self.environment = response["environment"]
+      self.domains = response["domain_name"].split if domains.nil?
     end
 
     def create_cloudfile

data/lib/shelly/cli/main.rb

@@ -47,12 +47,8 @@ module Shelly
         user = Shelly::User.new(email || ask_for_email, ask_for_password(:with_confirmation => false))
         user.login
         say "Login successful"
-        begin user.upload_ssh_key
-          conflict = false
-        rescue RestClient::Conflict
-          conflict = true
-        end
-        say "Uploading your public SSH key" if conflict == false
+        say "Uploading your public SSH key"
+        user.upload_ssh_key
         say "You have following clouds available:", :green
         user.apps.each do |app|
           say "  #{app["code_name"]}"
@@ -60,13 +56,14 @@ module Shelly
       rescue Client::APIError => e
         if e.validation?
           e.each_error { |error| say_error "#{error}", :with_exit => false }
+          exit 1
         end
         if e.unauthorized?
           say_error "Wrong email or password", :with_exit => false
           say_error "You can reset password by using link:", :with_exit => false
           say_error "#{e.url}", :with_exit => false
+          exit 1
         end
-        exit 1
       end
 
       method_option "code-name", :type => :string, :aliases => "-c",

data/lib/shelly/client.rb

@@ -64,8 +64,8 @@ module Shelly
       post("/apps", :app => attributes)
     end
 
-    def add_ssh_key(ssh_key)
-      post("/ssh_key", :ssh_key => ssh_key)
+    def update_ssh_key(ssh_key)
+      put("/ssh_key", :ssh_key => ssh_key)
     end
 
     def apps

data/lib/shelly/cloudfile.rb

@@ -1,5 +1,3 @@
-require "yaml"
-
 module Shelly
   class Cloudfile < Model
     attr_accessor :content

data/lib/shelly/templates/Cloudfile.erb

@@ -1,5 +1,5 @@
 <%= @code_name %>:
-  ruby_version: 1.9.2 # 1.9.2 or ree
+  ruby: 1.9.2 # 1.9.2 or ree
   environment: production # RAILS_ENV
   monitoring_email:
     - <%= @email %>

data/lib/shelly/user.rb

@@ -66,8 +66,8 @@ module Shelly
     end
 
     def upload_ssh_key
-      key = File.read(ssh_key_path).strip
-      shelly.add_ssh_key(key)
+      key = File.read(ssh_key_path)
+      shelly.update_ssh_key(key)
     end
 
     protected

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.21.pre5"
+  VERSION = "0.0.21"
 end

data/shelly.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "wijet-thor", "~> 0.14.7"
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "json"
-  s.add_runtime_dependency "wijet-launchy"
+  s.add_runtime_dependency "launchy"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/shelly/app_spec.rb

@@ -11,6 +11,16 @@ describe Shelly::App do
     @app.code_name = "foo-staging"
   end
 
+  describe "being initialized" do
+    it "should have default ruby_version: MRI-1.9.2" do
+      @app.ruby_version.should == "MRI-1.9.2"
+    end
+
+    it "should have default environment: production" do
+      @app.environment.should == "production"
+    end
+  end
+
   describe ".guess_code_name" do
     it "should return name of current working directory" do
       Shelly::App.guess_code_name.should == "foo"
@@ -50,7 +60,7 @@ describe Shelly::App do
       FakeFS.deactivate!
       expected = <<-config
 foo-staging:
-  ruby_version: 1.9.2 # 1.9.2 or ree
+  ruby: 1.9.2 # 1.9.2 or ree
   environment: production # RAILS_ENV
   monitoring_email:
     - bob@example.com
@@ -117,21 +127,21 @@ config
         attributes = {
           :code_name => "fooo",
           :name => "fooo",
-          :domains => nil
+          :environment => "production",
+          :ruby_version => "MRI-1.9.2",
+          :domain_name => nil
         }
         @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
-          "domains" => %w(fooo.shellyapp.com))
+          "domain_name" => "fooo.shellyapp.com")
         @app.create
       end
 
-      it "should assign returned git_url, domains, ruby_version and environment" do
+      it "should assign returned git_url and domain" do
         @client.stub(:create_app).and_return("git_url" => "git@git.example.com:fooo.git",
-          "domains" => ["fooo.shellyapp.com"], "ruby_version" => "1.9.2", "environment" => "production")
+          "domain_name" => "fooo.shellyapp.com")
         @app.create
         @app.git_url.should == "git@git.example.com:fooo.git"
         @app.domains.should == ["fooo.shellyapp.com"]
-        @app.ruby_version.should == "1.9.2"
-        @app.environment.should == "production"
       end
     end
 
@@ -142,18 +152,20 @@ config
         attributes = {
           :code_name => "boo",
           :name => "boo",
-          :domains => %w(boo.shellyapp.com boo.example.com)
+          :environment => "production",
+          :ruby_version => "MRI-1.9.2",
+          :domain_name => "boo.shellyapp.com boo.example.com"
         }
         @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
-          "domains" => %w(boo.shellyapp.com boo.example.com))
+          "domain_name" => "boo.shellyapp.com boo.example.com")
         @app.create
       end
 
       it "should assign returned git_url and domain" do
         @client.stub(:create_app).and_return("git_url" => "git@git.example.com:fooo.git",
-          "domains" => %w(boo.shellyapp.com boo.example.com))
+          "domain_name" => "boo.shellyapp.com boo.example.com")
         @app.create
-        @app.domains.should == %w(boo.shellyapp.com boo.example.com)
+        @app.domains.should == ["boo.shellyapp.com", "boo.example.com"]
       end
     end
   end

data/spec/shelly/cli/main_spec.rb

@@ -191,14 +191,6 @@ OUT
         end
       end
 
-      it "should upload user's public SSH key and raise HTTP status 409 Conflict when SSH key exists in database" do
-        @user.should_receive(:upload_ssh_key).and_raise(RestClient::Conflict)
-        $stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
-        fake_stdin(["megan@example.com", "secret"]) do
-          @main.login
-        end
-      end
-
       it "should display list of applications to which user has access" do
         $stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
         $stdout.should_receive(:puts).with("  abc")

data/spec/shelly/client_spec.rb

@@ -125,10 +125,10 @@ describe Shelly::Client do
     end
   end
 
-  describe "#add_ssh_key" do
+  describe "#update_ssh_key" do
     it "should send put with give SSH key" do
-      @client.should_receive(:post).with("/ssh_key", {:ssh_key => "abc"})
-      @client.add_ssh_key("abc")
+      @client.should_receive(:put).with("/ssh_key", {:ssh_key => "abc"})
+      @client.update_ssh_key("abc")
     end
   end
 

data/spec/shelly/user_spec.rb

@@ -122,7 +122,7 @@ describe Shelly::User do
 
   describe "#upload_ssh_key" do
     it "should read and upload user's public SSH key" do
-      @client.should_receive(:add_ssh_key).with("ssh-key AAbbcc")
+      @client.should_receive(:update_ssh_key).with("ssh-key AAbbcc")
       @user.upload_ssh_key
     end
   end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.21.pre5
-  prerelease: 7
+  version: 0.0.21
+  prerelease: 
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000Z
+date: 2011-11-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161001720 !ruby/object:Gem::Requirement
+  requirement: &2156379540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161001720
+  version_requirements: *2156379540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161001240 !ruby/object:Gem::Requirement
+  requirement: &2156379120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161001240
+  version_requirements: *2156379120
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2161000780 !ruby/object:Gem::Requirement
+  requirement: &2156372480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161000780
+  version_requirements: *2156372480
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2161000260 !ruby/object:Gem::Requirement
+  requirement: &2156371780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161000260
+  version_requirements: *2156371780
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &2160999740 !ruby/object:Gem::Requirement
+  requirement: &2156371240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160999740
+  version_requirements: *2156371240
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2160999320 !ruby/object:Gem::Requirement
+  requirement: &2156370820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160999320
+  version_requirements: *2156370820
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2160998820 !ruby/object:Gem::Requirement
+  requirement: &2156370400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160998820
+  version_requirements: *2156370400
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2160998100 !ruby/object:Gem::Requirement
+  requirement: &2156369960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160998100
+  version_requirements: *2156369960
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  requirement: &2160997460 !ruby/object:Gem::Requirement
+  requirement: &2156369460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *2160997460
+  version_requirements: *2156369460
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2160997040 !ruby/object:Gem::Requirement
+  requirement: &2156369040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160997040
+  version_requirements: *2156369040
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2160996580 !ruby/object:Gem::Requirement
+  requirement: &2156368580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160996580
+  version_requirements: *2156368580
 - !ruby/object:Gem::Dependency
-  name: wijet-launchy
-  requirement: &2160996140 !ruby/object:Gem::Requirement
+  name: launchy
+  requirement: &2156368160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160996140
+  version_requirements: *2156368160
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -203,9 +203,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.10