shelly 0.0.26 → 0.0.27

data/README.md

@@ -12,7 +12,7 @@
 
 ## Running tests
 
-    rake spec
+    bundle exec rake
 
 or
 

data/lib/shelly/cli/main.rb

@@ -126,6 +126,26 @@ module Shelly
       end
       map "status" => :list
 
+      desc "ip", "Lists clouds IP's"
+      def ip
+        say_error "Must be run inside your project git repository" unless App.inside_git_repository?
+        say_error "No Cloudfile found" unless Cloudfile.present?
+        @cloudfile = check_clouds.first
+        @cloudfile.fetch_ips.each do |server|
+          say "Cloud #{server['code_name']}:"
+          say "Web server IP : #{server['web_server_ip']}"
+          say "Mail server IP: #{server['mail_server_ip']}"
+        end
+      rescue Client::APIError => e
+        if e.unauthorized?
+          e.errors.each { |error| say_error error, :with_exit => false}
+          exit 1
+        else
+          say_error e.message
+        end
+      end
+
+
       # FIXME: move to helpers
       no_tasks do
         def check_options(options)

data/lib/shelly/cli/user.rb

@@ -50,23 +50,6 @@ module Shelly
           exit 1
         end
       end
-
-      no_tasks do
-        def check_clouds
-          @cloudfile = Shelly::Cloudfile.new
-          @user = Shelly::User.new
-          user_apps = @user.apps.map { |cloud| cloud['code_name'] }
-          unless @cloudfile.clouds.all? { |cloud| user_apps.include?(cloud) }
-            errors = (@cloudfile.clouds - user_apps).map do |cloud|
-              "You have no access to '#{cloud}' cloud defined in Cloudfile"
-            end
-            raise Shelly::Client::APIError.new({:message => "Unauthorized",
-              :errors => errors}.to_json)
-          end
-          [@cloudfile, @user]
-        end
-
-      end
     end
   end
 end

data/lib/shelly/client.rb

@@ -82,6 +82,12 @@ module Shelly
       end
     end
 
+    def apps_ips(apps)
+      apps.map do |app|
+        get("/apps/#{app}/ips")
+      end
+    end
+
     def post(path, params = {})
       request(path, :post, params)
     end

data/lib/shelly/cloudfile.rb

@@ -46,6 +46,13 @@ module Shelly
         result
       end
     end
+
+    def fetch_ips
+      response = shelly.apps_ips(clouds)
+      response.each do |result|
+        result
+      end
+    end
   end
 end
 

data/lib/shelly/helpers.rb

@@ -27,6 +27,19 @@ module Shelly
       say_error "Email can't be blank, please try again"
     end
 
+    def check_clouds
+        @cloudfile = Shelly::Cloudfile.new
+        @user = Shelly::User.new
+        user_apps = @user.apps.map { |cloud| cloud['code_name'] }
+        unless @cloudfile.clouds.all? { |cloud| user_apps.include?(cloud) }
+          errors = (@cloudfile.clouds - user_apps).map do |cloud|
+            "You have no access to '#{cloud}' cloud defined in Cloudfile"
+          end
+          raise Shelly::Client::APIError.new({:message => "Unauthorized",
+            :errors => errors}.to_json)
+        end
+        [@cloudfile, @user]
+      end
   end
 end
 

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 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 ip                # Lists clouds IP's
   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
@@ -440,5 +441,58 @@ OUT
     end
 
   end
+
+  describe "#ips" do
+    before do
+      File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
+      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 {
+        @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")
+      lambda {
+        @main.ip
+      }.should raise_error(SystemExit)
+    end
+
+    context "on success" do
+      it "should display mail and web server ip's" do
+        @client.should_receive(:apps).and_return([{"code_name" => "foo-production"},{"code_name" => "foo-staging"}])
+        @client.stub(:apps_ips).and_return(response)
+        $stdout.should_receive(:puts).with("Cloud foo-production:")
+        $stdout.should_receive(:puts).with("Web server IP : 22.22.22.22")
+        $stdout.should_receive(:puts).with("Mail server IP: 11.11.11.11")
+        @main.ip
+      end
+    end
+
+    def response
+      [{'code_name' => 'foo-production', 'mail_server_ip' => '11.11.11.11', 'web_server_ip' => '22.22.22.22'}]
+    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 { @main.ip }.should raise_error(SystemExit)
+      end
+
+      it "should raise an error if user does not have access to cloud" do
+        @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}])
+        @client.stub(:apps_users).and_return(response)
+        $stdout.should_receive(:puts).with("\e[31mYou have no access to 'foo-staging' cloud defined in Cloudfile\e[0m")
+        lambda { @main.ip }.should raise_error(SystemExit)
+      end
+    end
+  end
 end
 

metadata

@@ -1,156 +1,174 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: shelly
-version: !ruby/object:Gem::Version
-  version: 0.0.26
+version: !ruby/object:Gem::Version 
+  hash: 41
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 27
+  version: 0.0.27
 platform: ruby
-authors:
+authors: 
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2156723600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: *2156723600
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2156723140 !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: *2156723140
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &2156722620 !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: *2156722620
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &2156722100 !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: *2156722100
-- !ruby/object:Gem::Dependency
-  name: growl_notify
-  requirement: &2156721580 !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: *2156721580
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &2156721160 !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: *2156721160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: fakefs
-  requirement: &2156720740 !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: *2156720740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: &2156720060 !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: *2156720060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: wijet-thor
-  requirement: &2156719300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 14
+        - 7
         version: 0.14.7
   type: :runtime
-  prerelease: false
-  version_requirements: *2156719300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &2156718880 !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: *2156718880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2156718420 !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: *2156718420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: wijet-launchy
-  requirement: &2156717980 !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: *2156717980
+  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
@@ -190,38 +208,36 @@ 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
-      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/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
+test_files: []
+