shelly 0.0.39 → 0.0.40

data/lib/shelly/app.rb

@@ -1,13 +1,14 @@
 require 'erb'
 require 'launchy'
-require "shelly/backup"
 
 module Shelly
   class App < Model
     DATABASE_KINDS = %w(postgresql mongodb redis none)
 
     attr_accessor :code_name, :databases, :ruby_version, :environment,
-      :git_url, :domains, :web_server_ip, :mail_server_ip
+      :git_url, :domains
+
+    autoload :Backup, "shelly/backup"
 
     def initialize(code_name = nil)
       self.code_name = code_name
@@ -98,6 +99,10 @@ module Shelly
       File.basename(Dir.pwd)
     end
 
+    def ips
+      shelly.app_ips(code_name)
+    end
+
     def users
       shelly.app_users(code_name)
     end
@@ -130,18 +135,6 @@ module Shelly
       shelly.app_delete_config(code_name, path)
     end
 
-    def attributes
-      @attributes ||= shelly.app(code_name)
-    end
-
-    def web_server_ip
-      attributes["web_server_ip"]
-    end
-
-    def mail_server_ip
-      attributes["mail_server_ip"]
-    end
-
     def open_billing_page
       url = "#{shelly.shellyapp_url}/login?api_key=#{current_user.token}&return_to=/apps/#{code_name}/edit_billing"
       Launchy.open(url)

data/lib/shelly/cli/main.rb

@@ -143,14 +143,14 @@ module Shelly
 
       desc "ip", "Lists clouds IP's"
       def ip
-        say_error "No Cloudfile found" unless Cloudfile.present?
         @cloudfile = Cloudfile.new
         @cloudfile.clouds.each do |cloud|
           begin
             @app = App.new(cloud)
             say "Cloud #{cloud}:", :green
-            print_wrapped "Web server IP: #{@app.web_server_ip}", :ident => 2
-            print_wrapped "Mail server IP: #{@app.mail_server_ip}", :ident => 2
+            ips = @app.ips
+            print_wrapped "Web server IP: #{ips['web_server_ip']}", :ident => 2
+            print_wrapped "Mail server IP: #{ips['mail_server_ip']}", :ident => 2
           rescue Client::APIError => e
             if e.unauthorized?
               say_error "You have no access to '#{cloud}' cloud defined in Cloudfile", :with_exit => false

data/lib/shelly/client.rb

@@ -115,10 +115,6 @@ module Shelly
     def apps
       get("/apps")
     end
-    
-    def app(code_name)
-      get("/apps/#{code_name}")
-    end
 
     def deploy_logs(cloud)
       get("/apps/#{cloud}/deploys")
@@ -152,6 +148,10 @@ module Shelly
       get("/apps/#{cloud}/users")
     end
 
+    def app_ips(cloud)
+      get("/apps/#{cloud}/ips")
+    end
+
     def post(path, params = {})
       request(path, :post, params)
     end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.39"
+  VERSION = "0.0.40"
 end

data/lib/thor/thor.rb

@@ -6,7 +6,7 @@ class Thor
     end
 
     def send(*args)
-      if args.first == :dispatch
+      if args.first == :dispatch && !args[2].empty?
         running_task = args[2].first
         @hook.each do |method, options|
           if options[:only].include?(running_task.to_sym)

data/spec/shelly/app_spec.rb

@@ -24,6 +24,13 @@ describe Shelly::App do
     end
   end
 
+  describe "#ips" do
+    it "should get app's ips" do
+      @client.should_receive(:app_ips).with("foo-staging")
+      @app.ips
+    end
+  end
+
   describe "#add_git_remote" do
     before do
       @app.stub(:git_url).and_return("git@git.shellycloud.com:foo-staging.git")
@@ -57,30 +64,6 @@ describe Shelly::App do
       @app.shelly_generated_configs
     end
   end
-  
-  describe "#attributes" do
-    before do
-      @response = {"web_server_ip" => "192.0.2.1", "mail_server_ip" => "192.0.2.3"}
-      @client.stub(:app).and_return(@response)
-    end
-    
-    it "should fetch app attributes from API and cache them" do
-      @client.should_receive(:app).with("foo-staging").exactly(:once).and_return(@response)
-      2.times { @app.attributes }
-    end
-    
-    describe "#web_server_ip" do
-      it "should return web server ip address" do
-        @app.web_server_ip.should == "192.0.2.1"
-      end
-    end
-    
-    describe "#mail_server_ip" do
-      it "should return mail server ip address" do
-        @app.mail_server_ip.should == "192.0.2.3"
-      end
-    end
-  end
 
   describe "#generate_cloudfile" do
     it "should return generated cloudfile" do

data/spec/shelly/cli/main_spec.rb

@@ -673,6 +673,14 @@ OUT
       Shelly::App.stub(:inside_git_repository?).and_return(true)
     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")
+      lambda {
+        invoke(@main, :ip)
+      }.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")
@@ -683,7 +691,7 @@ OUT
 
     context "on success" do
       it "should display mail and web server ip's" do
-        @client.stub(:app).and_return(response)
+        @client.stub(:app_ips).and_return(response)
         $stdout.should_receive(:puts).with("\e[32mCloud foo-production:\e[0m")
         $stdout.should_receive(:puts).with("  Web server IP: 22.22.22.22")
         $stdout.should_receive(:puts).with("  Mail server IP: 11.11.11.11")
@@ -696,10 +704,16 @@ OUT
     end
 
     context "on failure" do
+      it "should raise an error if user is not in 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")
+        lambda { invoke(@main, :ip) }.should raise_error(SystemExit)
+      end
+
       it "should raise an error if user does not have access to cloud" do
         response = {"message" => "Cloud foo-staging not found"}
         exception = Shelly::Client::APIError.new(response.to_json, 404)
-        @client.stub(:app).and_raise(exception)
+        @client.stub(:app_ips).and_raise(exception)
         $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
         invoke(@main, :ip)
       end

data/spec/shelly/client_spec.rb

@@ -167,13 +167,12 @@ describe Shelly::Client do
       response.should == [{"email" => "test@example.com"}, {"email" => "test2@example.com"}]
     end
   end
-  
-  describe "#app" do
-    it "should fetch app from API" do
-      FakeWeb.register_uri(:get, api_url("apps/staging-foo"), 
-        :body => {:web_server_ip => "192.0.2.1", :mail_server_ip => "192.0.2.3"}.to_json)
-      response = @client.app("staging-foo")
-      response.should == {"web_server_ip" => "192.0.2.1", "mail_server_ip" => "192.0.2.3"}
+
+  describe "#app_ips" do
+    it "should send get request with app code_name" do
+      FakeWeb.register_uri(:get, api_url("apps/staging-foo/ips"), :body => {:mail_server_ip => "10.0.1.1", :web_server_ip => "88.198.21.187"}.to_json)
+      response = @client.app_ips("staging-foo")
+      response.should == {"mail_server_ip" => "10.0.1.1", "web_server_ip" => "88.198.21.187"}
     end
   end
 

metadata

@@ -1,217 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shelly
-version: !ruby/object:Gem::Version 
-  hash: 81
+version: !ruby/object:Gem::Version
+  version: 0.0.40
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 39
-  version: 0.0.39
 platform: ruby
-authors: 
+authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-30 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &70136906680620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70136906680620
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: &70136906696580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70136906696580
+- !ruby/object:Gem::Dependency
   name: guard
+  requirement: &70136906696160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70136906696160
+- !ruby/object:Gem::Dependency
   name: guard-rspec
+  requirement: &70136906695740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70136906695740
+- !ruby/object:Gem::Dependency
   name: growl_notify
+  requirement: &70136906695280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70136906695280
+- !ruby/object:Gem::Dependency
   name: rb-fsevent
+  requirement: &70136906694860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70136906694860
+- !ruby/object:Gem::Dependency
   name: fakefs
+  requirement: &70136906694440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70136906694440
+- !ruby/object:Gem::Dependency
   name: fakeweb
+  requirement: &70136906694020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70136906694020
+- !ruby/object:Gem::Dependency
   name: wijet-thor
-  type: :runtime
-  prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70136906693520 !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
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   type: :runtime
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70136906693520
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70136906693100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  name: json
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70136906693100
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70136906692640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
-  name: wijet-launchy
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70136906692640
+- !ruby/object:Gem::Dependency
+  name: wijet-launchy
+  requirement: &70136906692220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id012
-- !ruby/object:Gem::Dependency 
-  name: progressbar
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70136906692220
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: &70136906691800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id013
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70136906691800
 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
@@ -261,41 +211,37 @@ files:
 - spec/shelly/user_spec.rb
 - spec/spec_helper.rb
 - spec/thor/options_spec.rb
-has_rdoc: true
 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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2595737964624093032
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2595737964624093032
 requirements: []
-
 rubyforge_project: shelly
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 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