shelly 0.0.17 → 0.0.18

data/lib/shelly/app.rb

@@ -12,7 +12,7 @@ module Shelly
     end
 
     def add_git_remote
-      system("git remote rm production &> /dev/null")
+      system("git remote rm production > /dev/null 2>&1")
       system("git remote add production #{git_url}")
     end
 
@@ -35,7 +35,7 @@ module Shelly
         :code_name    => code_name,
         :environment  => environment,
         :ruby_version => ruby_version,
-        :domain_name  => domains
+        :domain_name  => domains ? domains.join(" ") : nil
       }
       response = shelly.create_app(attributes)
       self.git_url = response["git_url"]
@@ -69,3 +69,4 @@ module Shelly
     end
   end
 end
+

data/lib/shelly/cli/users.rb

@@ -11,6 +11,7 @@ module Shelly
       desc "list", "List users who have access to current application"
       def list
         say_error "Must be run inside your project git repository" unless App.inside_git_repository?
+        say_error "No Cloudfile found" unless Cloudfile.present?
         @cloudfile = Shelly::Cloudfile.new
         @cloudfile.fetch_users.each do |app, users|
           say "Cloud #{app}:"
@@ -24,6 +25,7 @@ module Shelly
       desc "add [EMAIL]", "Add new developer to applications defined in Cloudfile"
       def add(email = nil)
         say_error "Must be run inside your project git repository" unless App.inside_git_repository?
+        say_error "No Cloudfile found" unless Cloudfile.present?
         user_email = email || ask_for_email({:guess_email => false})
         @cloudfile = Shelly::Cloudfile.new
         @user = Shelly::User.new

data/lib/shelly/cloudfile.rb

@@ -2,6 +2,10 @@ module Shelly
   class Cloudfile < Base
     attr_accessor :content
 
+    def self.present?
+      File.exists?(File.join(Dir.pwd, "Cloudfile"))
+    end
+
     def initialize
       open if File.exists?(path)
     end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/spec/shelly/app_spec.rb

@@ -41,7 +41,7 @@ describe Shelly::App do
     end
 
     it "should try to remove existing git remote" do
-      @app.should_receive(:system).with("git remote rm production &> /dev/null")
+      @app.should_receive(:system).with("git remote rm production > /dev/null 2>&1")
       @app.add_git_remote
     end
 
@@ -154,7 +154,7 @@ config
           :name => "boo",
           :environment => "production",
           :ruby_version => "MRI-1.9.2",
-          :domain_name => ["boo.shellyapp.com", "boo.example.com"]
+          :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",
           "domain_name" => "boo.shellyapp.com boo.example.com")
@@ -170,3 +170,4 @@ config
     end
   end
 end
+

data/spec/shelly/cli/main_spec.rb

@@ -40,14 +40,16 @@ OUT
       @client.stub(:register_user)
       @key_path = File.expand_path("~/.ssh/id_rsa.pub")
       @user = Shelly::User.new
-      @user.stub(:ssh_key_registered?)
+      FileUtils.mkdir_p("~/.ssh")
+      File.open("~/.ssh/id_rsa.pub", "w") { |f| f << "ssh-key AAbbcc" }
+      @client.stub(:ssh_key_available?)
       Shelly::User.stub(:new).and_return(@user)
     end
 
     it "should return false if ssh key don't exist on local hard drive" do
-      @user.stub(:ssh_key_registered?).and_raise(Errno::ENOENT)
-      File.exists?(File.expand_path("~/.ssh/id_rsa.pub")).should be_false
-      $stdout.should_receive(:puts).with("\e[31mNo such file or directory\e[0m")
+      FileUtils.rm_rf(@key_path)
+      File.exists?(@key_path).should be_false
+      $stdout.should_receive(:puts).with("\e[31mNo such file or directory - " + @key_path + "\e[0m")
       $stdout.should_receive(:puts).with("\e[31mUse ssh-keygen to generate ssh key pair\e[0m")
       lambda {
         @main.register
@@ -75,14 +77,14 @@ OUT
     it "should suggest email and use it if user enters blank email" 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)
+      @client.should_receive(:register_user).with("kate@example.com", "secret", "ssh-key AAbbcc")
       fake_stdin(["", "secret", "secret"]) do
         @main.register
       end
     end
 
     it "should use email provided by user" do
-      @client.should_receive(:register_user).with("better@example.com", "secret", nil)
+      @client.should_receive(:register_user).with("better@example.com", "secret", "ssh-key AAbbcc")
       fake_stdin(["better@example.com", "secret", "secret"]) do
         @main.register
       end
@@ -120,6 +122,8 @@ OUT
 
     context "public SSH key doesn't exist" do
       it "should register user without the public SSH key" do
+        @user.stub(:ssh_key_registered?)
+        FileUtils.rm_rf(@key_path)
         $stdout.should_not_receive(:puts).with("Uploading your public SSH key from #{@key_path}")
         fake_stdin(["kate@example.com", "secret", "secret"]) do
           @main.register

data/spec/shelly/cli/users_spec.rb

@@ -30,7 +30,6 @@ describe Shelly::CLI::Users do
     end
 
     it "should exit with message if command run outside git repository" do
-      @client.stub(:app_users).and_return(response)
       Shelly::App.stub(:inside_git_repository?).and_return(false)
       $stdout.should_receive(:puts).with("\e[31mMust be run inside your project git repository\e[0m")
       lambda {
@@ -38,6 +37,14 @@ describe Shelly::CLI::Users do
       }.should raise_error(SystemExit)
     end
 
+    it "should exit with message if there is no Cloudfile" do
+      File.delete("Cloudfile")
+      $stdout.should_receive(:puts).with("\e[31mNo Cloudfile found\e[0m")
+      lambda {
+        @users.list
+      }.should raise_error(SystemExit)
+    end
+
     context "on success" do
       it "should receive clouds from the Cloudfile" do
         @client.should_receive(:app_users).with(["foo-production", "foo-staging"]).
@@ -83,6 +90,14 @@ describe Shelly::CLI::Users do
       Shelly::User.stub(:new).and_return(@user)
     end
 
+    it "should exit with message if there is no Cloudfile" do
+      File.delete("Cloudfile")
+      $stdout.should_receive(:puts).with("\e[31mNo Cloudfile found\e[0m")
+      lambda {
+        @users.list
+      }.should raise_error(SystemExit)
+    end
+
     it "should exit with message if command run outside git repository" do
       Shelly::App.stub(:inside_git_repository?).and_return(false)
       $stdout.should_receive(:puts).with("\e[31mMust be run inside your project git repository\e[0m")

metadata

@@ -1,156 +1,172 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: shelly
-version: !ruby/object:Gem::Version
-  version: 0.0.17
+version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 18
+  version: 0.0.18
 platform: ruby
-authors:
+authors: 
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-11-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2156677640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: *2156677640
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2156677220 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2156677220
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &2156676800 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *2156676800
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &2156676380 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: guard
   prerelease: false
-  version_requirements: *2156676380
-- !ruby/object:Gem::Dependency
-  name: growl_notify
-  requirement: &2156675920 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
   prerelease: false
-  version_requirements: *2156675920
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &2156675500 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2156675500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: fakefs
-  requirement: &2156675080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2156675080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: &2156674660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2156674660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: &2156674240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156674240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &2156673780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156673780
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2156673340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156673340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: launchy
-  requirement: &2156672840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156672840
+  version_requirements: *id010
 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
@@ -185,36 +201,36 @@ files:
 - spec/spec_helper.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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: shelly
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool
-test_files:
-- spec/helpers.rb
-- spec/input_faker.rb
-- spec/shelly/app_spec.rb
-- spec/shelly/base_spec.rb
-- spec/shelly/cli/main_spec.rb
-- spec/shelly/cli/users_spec.rb
-- spec/shelly/client_spec.rb
-- spec/shelly/cloudfile_spec.rb
-- spec/shelly/user_spec.rb
-- spec/spec_helper.rb
+test_files: []
+