shelly 0.0.20 → 0.0.21.pre

data/lib/shelly/app.rb

@@ -4,12 +4,8 @@ require 'launchy'
 module Shelly
   class App < Base
     DATABASE_KINDS = %w(postgresql mongodb redis none)
-    attr_accessor :code_name, :databases, :ruby_version, :environment, :git_url, :domains
-
-    def initialize
-      @ruby_version = "MRI-1.9.2"
-      @environment = "production"
-    end
+    attr_accessor :code_name, :databases, :ruby_version, :environment,
+      :git_url, :domains
 
     def add_git_remote
       system("git remote rm production > /dev/null 2>&1")
@@ -18,8 +14,6 @@ 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)
@@ -30,16 +24,12 @@ module Shelly
     end
 
     def create
-      attributes = {
-        :name         => code_name,
-        :code_name    => code_name,
-        :environment  => environment,
-        :ruby_version => ruby_version,
-        :domain_name  => domains ? domains.join(" ") : nil
-      }
+      attributes = {:name => code_name, :code_name => code_name, :domains => domains}
       response = shelly.create_app(attributes)
       self.git_url = response["git_url"]
-      self.domains = response["domain_name"].split if domains.nil?
+      self.domains = response["domains"]
+      self.ruby_version = response["ruby_version"]
+      self.environment = response["environment"]
     end
 
     def create_cloudfile

data/lib/shelly/cli/main.rb

@@ -7,7 +7,7 @@ module Shelly
     class Main < Thor
       include Thor::Actions
       include Helpers
-      register(User, "user", "user <command>", "Manages users using this cloud")
+      register(User, "user", "user <command>", "Manages users using this app")
       check_unknown_options!
 
       map %w(-v --version) => :version
@@ -50,7 +50,7 @@ module Shelly
         say "Login successful"
         say "Uploading your public SSH key"
         user.upload_ssh_key
-        say "You have following clouds available:", :green
+        say "You have following applications available:", :green
         user.apps.each do |app|
           say "  #{app["code_name"]}"
         end
@@ -68,14 +68,14 @@ module Shelly
       end
 
       method_option "code-name", :type => :string, :aliases => "-c",
-        :desc => "Unique code-name of your cloud"
+        :desc => "Unique code_name of your application"
       method_option :databases, :type => :array, :aliases => "-d",
-        :banner => Shelly::App::DATABASE_KINDS.join(', '),
+        :banner => "#{Shelly::App::DATABASE_KINDS.join(', ')}",
         :desc => "Array of databases of your choice"
       method_option :domains, :type => :array,
         :banner => "CODE-NAME.shellyapp.com, YOUR-DOMAIN.com",
         :desc => "Array of your domains"
-      desc "add", "Adds new cloud to Shelly Cloud"
+      desc "add", "Adds new application to Shelly Cloud"
       def add
         say_error "Must be run inside your project git repository" unless App.inside_git_repository?
         check_options(options)
@@ -101,7 +101,7 @@ module Shelly
         if e.validation?
           e.each_error { |error| say_error "#{error}", :with_exit => false }
           say_new_line
-          say_error "Fix erros in the below command and type it again to create your cloud" , :with_exit => false
+          say_error "Fix erros in the below command and type it again to create your application" , :with_exit => false
           say_error "shelly add --code-name=#{@app.code_name} --databases=#{@app.databases.join} --domains=#{@app.code_name}.shellyapp.com"
         end
       end
@@ -144,7 +144,7 @@ module Shelly
 
         def ask_for_code_name
           default_code_name = "#{Shelly::App.guess_code_name}-production"
-          code_name = ask("Cloud code name (#{default_code_name} - default):")
+          code_name = ask("Application code name (#{default_code_name} - default):")
           code_name.blank? ? default_code_name : code_name
         end
 

data/lib/shelly/cloudfile.rb

@@ -39,8 +39,7 @@ module Shelly
       response = shelly.apps_users(clouds)
       response.inject({}) do |result, app|
         result[app['code_name']] = app['users'].map do |user|
-          name = user['name'] ? " (#{user['name']})" : ""
-          "#{user['email']}" + name
+          "#{user['email']} (#{user['name']})"
         end
         result
       end

data/lib/shelly/templates/Cloudfile.erb

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

data/lib/shelly/version.rb

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

data/shelly.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
   end
   s.add_development_dependency "fakefs"
   s.add_development_dependency "fakeweb"
-  s.add_runtime_dependency "wijet-thor"
+  s.add_runtime_dependency "thor"
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "json"
-  s.add_runtime_dependency "launchy"
+  s.add_runtime_dependency "wijet-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,16 +11,6 @@ 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"
@@ -60,7 +50,7 @@ describe Shelly::App do
       FakeFS.deactivate!
       expected = <<-config
 foo-staging:
-  ruby: 1.9.2 # 1.9.2 or ree
+  ruby_version: 1.9.2 # 1.9.2 or ree
   environment: production # RAILS_ENV
   monitoring_email:
     - bob@example.com
@@ -127,21 +117,21 @@ config
         attributes = {
           :code_name => "fooo",
           :name => "fooo",
-          :environment => "production",
-          :ruby_version => "MRI-1.9.2",
-          :domain_name => nil
+          :domains => nil
         }
         @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
-          "domain_name" => "fooo.shellyapp.com")
+          "domains" => %w(fooo.shellyapp.com))
         @app.create
       end
 
-      it "should assign returned git_url and domain" do
+      it "should assign returned git_url, domains, ruby_version and environment" do
         @client.stub(:create_app).and_return("git_url" => "git@git.example.com:fooo.git",
-          "domain_name" => "fooo.shellyapp.com")
+          "domains" => ["fooo.shellyapp.com"], "ruby_version" => "1.9.2", "environment" => "production")
         @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
 
@@ -152,20 +142,18 @@ config
         attributes = {
           :code_name => "boo",
           :name => "boo",
-          :environment => "production",
-          :ruby_version => "MRI-1.9.2",
-          :domain_name => "boo.shellyapp.com boo.example.com"
+          :domains => %w(boo.shellyapp.com boo.example.com)
         }
         @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
-          "domain_name" => "boo.shellyapp.com boo.example.com")
+          "domains" => %w(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",
-          "domain_name" => "boo.shellyapp.com boo.example.com")
+          "domains" => %w(boo.shellyapp.com boo.example.com))
         @app.create
-        @app.domains.should == ["boo.shellyapp.com", "boo.example.com"]
+        @app.domains.should == %w(boo.shellyapp.com boo.example.com)
       end
     end
   end

data/spec/shelly/cli/main_spec.rb

@@ -23,11 +23,11 @@ describe Shelly::CLI::Main do
     it "should display available commands" do
       expected = <<-OUT
 Tasks:
-  shelly add               # Adds new cloud to Shelly Cloud
+  shelly add               # Adds new application to Shelly Cloud
   shelly help [TASK]       # Describe available tasks or one specific task
   shelly login [EMAIL]     # Logs user in to Shelly Cloud
   shelly register [EMAIL]  # Registers new user account on Shelly Cloud
-  shelly user <command>    # Manages users using this cloud
+  shelly user <command>    # Manages users using this app
   shelly version           # Displays shelly version
 OUT
       out = IO.popen("bin/shelly").read.strip
@@ -189,7 +189,7 @@ OUT
       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("\e[32mYou have following applications available:\e[0m")
         $stdout.should_receive(:puts).with("  abc")
         $stdout.should_receive(:puts).with("  fooo")
         fake_stdin(["megan@example.com", "secret"]) do
@@ -277,7 +277,7 @@ OUT
     end
 
     it "should use code name provided by user" do
-      $stdout.should_receive(:print).with("Cloud code name (foo-production - default): ")
+      $stdout.should_receive(:print).with("Application code name (foo-production - default): ")
       @app.should_receive(:code_name=).with("mycodename")
       fake_stdin(["mycodename", ""]) do
         @main.add
@@ -286,7 +286,7 @@ OUT
 
     context "when user provided empty code name" do
       it "should use 'current_dirname-purpose' as default" do
-        $stdout.should_receive(:print).with("Cloud code name (foo-production - default): ")
+        $stdout.should_receive(:print).with("Application code name (foo-production - default): ")
         @app.should_receive(:code_name=).with("foo-production")
         fake_stdin(["", ""]) do
           @main.add
@@ -331,7 +331,7 @@ OUT
       exception = Shelly::Client::APIError.new(response.to_json)
       @app.should_receive(:create).and_raise(exception)
       $stdout.should_receive(:puts).with("\e[31mCode name has been already taken\e[0m")
-      $stdout.should_receive(:puts).with("\e[31mFix erros in the below command and type it again to create your cloud\e[0m")
+      $stdout.should_receive(:puts).with("\e[31mFix erros in the below command and type it again to create your application\e[0m")
       $stdout.should_receive(:puts).with("\e[31mshelly add --code-name=foo-production --databases=postgresql --domains=foo-production.shellyapp.com\e[0m")
       lambda {
         fake_stdin(["", ""]) do

data/spec/shelly/cli/user_spec.rb

@@ -16,7 +16,7 @@ describe Shelly::CLI::User do
     it "should show help" do
       $stdout.should_receive(:puts).with("Tasks:")
       $stdout.should_receive(:puts).with(/add \[EMAIL\]\s+# Add new developer to clouds defined in Cloudfile/)
-        $stdout.should_receive(:puts).with(/list\s+# List users with access to clouds defined in Cloudfile/)
+      $stdout.should_receive(:puts).with(/list\s+# List users with access to clouds defined in Cloudfile/)
       @cli_user.help
     end
   end
@@ -56,7 +56,7 @@ describe Shelly::CLI::User do
         @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}, {"code_name" => "foo-staging"}])
         @client.stub(:apps_users).and_return(response)
         $stdout.should_receive(:puts).with("Cloud foo-production:")
-        $stdout.should_receive(:puts).with("  user@example.com")
+        $stdout.should_receive(:puts).with("  user@example.com (username)")
         $stdout.should_receive(:puts).with("Cloud foo-staging:")
         $stdout.should_receive(:puts).with("  user2@example.com (username2)")
         @cli_user.list
@@ -64,7 +64,7 @@ describe Shelly::CLI::User do
     end
 
     def response
-      [{'code_name' => 'foo-production', 'users' => [{'email' => 'user@example.com'}]},
+      [{'code_name' => 'foo-production', 'users' => [{'name' => 'username','email' => 'user@example.com'}]},
        {'code_name' => 'foo-staging', 'users' => [{'name' => 'username2','email' => 'user2@example.com'}]}]
     end
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.20
-  prerelease: 
+  version: 0.0.21.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-20 00:00:00.000000000Z
+date: 2011-11-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157193360 !ruby/object:Gem::Requirement
+  requirement: &2152869040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157193360
+  version_requirements: *2152869040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157192880 !ruby/object:Gem::Requirement
+  requirement: &2152868540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157192880
+  version_requirements: *2152868540
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2157192320 !ruby/object:Gem::Requirement
+  requirement: &2152868020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157192320
+  version_requirements: *2152868020
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2157191000 !ruby/object:Gem::Requirement
+  requirement: &2152861100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157191000
+  version_requirements: *2152861100
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &2157190360 !ruby/object:Gem::Requirement
+  requirement: &2152860640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157190360
+  version_requirements: *2152860640
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2157189940 !ruby/object:Gem::Requirement
+  requirement: &2152860220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157189940
+  version_requirements: *2152860220
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2157189500 !ruby/object:Gem::Requirement
+  requirement: &2152859800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157189500
+  version_requirements: *2152859800
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2157188860 !ruby/object:Gem::Requirement
+  requirement: &2152859380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157188860
+  version_requirements: *2152859380
 - !ruby/object:Gem::Dependency
-  name: wijet-thor
-  requirement: &2157188220 !ruby/object:Gem::Requirement
+  name: thor
+  requirement: &2152858960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157188220
+  version_requirements: *2152858960
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2157175600 !ruby/object:Gem::Requirement
+  requirement: &2152858540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157175600
+  version_requirements: *2152858540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2157174960 !ruby/object:Gem::Requirement
+  requirement: &2152858120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157174960
+  version_requirements: *2152858120
 - !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: &2157174340 !ruby/object:Gem::Requirement
+  name: wijet-launchy
+  requirement: &2152857640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157174340
+  version_requirements: *2152857640
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -200,9 +200,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.10