shelly 0.0.25 → 0.0.26

data/lib/shelly/app.rb

@@ -4,12 +4,9 @@ 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
 
-    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 +15,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 +25,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

@@ -53,10 +53,7 @@ module Shelly
           conflict = true
         end
         say "Uploading your public SSH key" if conflict == false
-        say "You have following clouds available:", :green
-        user.apps.each do |app|
-          say "  #{app["code_name"]}"
-        end
+        invoke :list
       rescue Client::APIError => e
         if e.validation?
           e.each_error { |error| say_error "#{error}", :with_exit => false }
@@ -108,6 +105,27 @@ module Shelly
         end
       end
 
+      desc "list", "Lists all your clouds"
+      def list
+        user = Shelly::User.new
+        user.token
+        apps = user.apps
+        unless apps.empty?
+          say "You have following clouds available:", :green
+          print_table(apps.map do |app|
+            state = app["state"] == "deploy_failed" ? " (Support has been notified)" : ""
+            [app["code_name"], "|  #{app["state"].gsub("_", " ")}#{state}"]
+          end, :ident => 2)
+        else
+          say "You have no clouds yet", :green
+        end
+      rescue Client::APIError => e
+        if e.unauthorized?
+          say_error "You are not logged in, use `shelly login`"
+        end
+      end
+      map "status" => :list
+
       # FIXME: move to helpers
       no_tasks do
         def check_options(options)

data/lib/shelly/cloudfile.rb

@@ -41,7 +41,7 @@ module Shelly
       response = shelly.apps_users(clouds)
       response.inject({}) do |result, app|
         result[app['code_name']] = app['users'].map do |user|
-          user['name'] ? "#{user['email']} (#{user['name']})" : user['email']
+          user['email']
         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.25"
+  VERSION = "0.0.26"
 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 "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

@@ -25,6 +25,7 @@ describe Shelly::CLI::Main do
 Tasks:
   shelly add               # Adds new cloud to Shelly Cloud
   shelly help [TASK]       # Describe available tasks or one specific task
+  shelly list              # Lists all your clouds
   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
@@ -165,7 +166,8 @@ OUT
       @user = Shelly::User.new
       @user.stub(:upload_ssh_key)
       @client.stub(:token).and_return("abc")
-      @client.stub(:apps).and_return([{"code_name" => "abc"}, {"code_name" => "fooo"}])
+      @client.stub(:apps).and_return([{"code_name" => "abc", "state" => "running"},
+        {"code_name" => "fooo", "state" => "no_code"},])
       Shelly::User.stub(:new).and_return(@user)
     end
 
@@ -201,8 +203,8 @@ OUT
 
       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")
-        $stdout.should_receive(:puts).with("  fooo")
+        $stdout.should_receive(:puts).with(/  abc\s+\|  running/)
+        $stdout.should_receive(:puts).with(/  fooo\s+\|  no code/)
         fake_stdin(["megan@example.com", "secret"]) do
           @main.login
         end
@@ -396,5 +398,47 @@ OUT
       end
     end
   end
+
+  describe "#list" do
+    before do
+      @user = Shelly::User.new
+      @client.stub(:token).and_return("abc")
+      @client.stub(:apps).and_return([{"code_name" => "abc", "state" => "running"},
+         {"code_name" => "fooo", "state" => "deploy_failed"}])
+      Shelly::User.stub(:new).and_return(@user)
+    end
+
+    it "should display user's clouds" do
+      $stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
+      $stdout.should_receive(:puts).with(/abc\s+\|  running/)
+      $stdout.should_receive(:puts).with(/fooo\s+\|  deploy failed \(Support has been notified\)/)
+      @main.list
+    end
+
+    it "should display info that user has no clouds" do
+      @client.stub(:apps).and_return([])
+      $stdout.should_receive(:puts).with("\e[32mYou have no clouds yet\e[0m")
+      @main.list
+    end
+
+    it "should have a 'status' alias" do
+      @client.stub(:apps).and_return([])
+      $stdout.should_receive(:puts).with("\e[32mYou have no clouds yet\e[0m")
+      Shelly::CLI::Main.start(["status"])
+    end
+
+    context "on failure" do
+      it "should display info that user is not logged in" do
+        body = {"message" => "Unauthorized"}
+        error = Shelly::Client::APIError.new(body.to_json)
+        @client.stub(:token).and_raise(error)
+        $stdout.should_receive(:puts).with("\e[31mYou are not logged in, use `shelly login`\e[0m")
+        lambda {
+          @main.list
+        }.should raise_error(SystemExit)
+      end
+    end
+
+  end
 end
 

data/spec/shelly/cli/user_spec.rb

@@ -58,7 +58,7 @@ describe Shelly::CLI::User do
         $stdout.should_receive(:puts).with("Cloud foo-production:")
         $stdout.should_receive(:puts).with("  user@example.com")
         $stdout.should_receive(:puts).with("Cloud foo-staging:")
-        $stdout.should_receive(:puts).with("  user2@example.com (username2)")
+        $stdout.should_receive(:puts).with("  user2@example.com")
         @cli_user.list
       end
     end

data/spec/shelly/cloudfile_spec.rb

@@ -27,11 +27,11 @@ describe Shelly::Cloudfile do
       @cloudfile.write(@hash)
       @client.should_receive(:apps_users).and_return(response)
       response = @cloudfile.fetch_users
-      response.should == {"foo-staging" => ["user@example.com (username)"]}
+      response.should == {"foo-staging" => ["user@example.com"]}
     end
 
     def response
-      [{'code_name' => 'foo-staging','users' => [{'name' => 'username','email' => 'user@example.com'}]}]
+      [{'code_name' => 'foo-staging','users' => [{'email' => 'user@example.com'}]}]
     end
   end
 

metadata

@@ -1,174 +1,156 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shelly
-version: !ruby/object:Gem::Version 
-  hash: 45
+version: !ruby/object:Gem::Version
+  version: 0.0.26
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 25
-  version: 0.0.25
 platform: ruby
-authors: 
+authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156723600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156723600
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2156723140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156723140
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &2156722620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2156722620
+- !ruby/object:Gem::Dependency
   name: guard-rspec
+  requirement: &2156722100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156722100
+- !ruby/object:Gem::Dependency
+  name: growl_notify
+  requirement: &2156721580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2156721580
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &2156721160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2156721160
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &2156720740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156720740
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &2156720060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: wijet-thor
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2156720060
+- !ruby/object:Gem::Dependency
+  name: wijet-thor
+  requirement: &2156719300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 14
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.14.7
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2156719300
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &2156718880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2156718880
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2156718420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2156718420
+- !ruby/object:Gem::Dependency
+  name: wijet-launchy
+  requirement: &2156717980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: *2156717980
 description: Tool for managing applications and clouds at shellycloud.com
-email: 
+email:
 - support@shellycloud.com
-executables: 
+executables:
 - shelly
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -208,36 +190,38 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shelly
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool
-test_files: []
-
+test_files:
+- spec/helpers.rb
+- spec/input_faker.rb
+- spec/shelly/app_spec.rb
+- spec/shelly/cli/main_spec.rb
+- spec/shelly/cli/runner_spec.rb
+- spec/shelly/cli/user_spec.rb
+- spec/shelly/client_spec.rb
+- spec/shelly/cloudfile_spec.rb
+- spec/shelly/model_spec.rb
+- spec/shelly/user_spec.rb
+- spec/spec_helper.rb
+- spec/thor/options_spec.rb