shelly 0.4.23 → 0.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 156c647aa3ce6482062d6bdfb9cef969f492b1a8
-  data.tar.gz: 27c61878672f174c08b2b7f6b92a39a96fb7ea03
+  metadata.gz: 25534c9362fd63574107232cf2eadd9c2b200627
+  data.tar.gz: 833dd066a7c2451b69f719c84fdfdbc1a15222a4
 SHA512:
-  metadata.gz: 4a47ff8e7391d5001d705c0ea7ac2753604a44fb02d36366046ccf233481e08ae860a62373bb4a540e2fa64acf008069debe7506d484397ca0ff7afb69f69252
-  data.tar.gz: 8b8cab53bb372b57ea65e8d100506f151a3250a8bc5e3d0d26629d4089c4daf19ede26361c04ea0d54f30b3d136856075a2edfdcb70865d6f60a83482229cb1d
+  metadata.gz: 37591a488e05a52e64d0f49eff04dedfc8199b98186ea9deeb7dff40e55d6f0896a21042d4cea1043a5826328092a5b4a945dad98ccce36849b8baadeb6d9921
+  data.tar.gz: 46d2dc570e9f0c519be6117bd040c8be91e8d1352e8ca5ec00dacf5744f018a845f85a3c91c696a9e7315eee947bfcdb738f611403c8df8ca1c18c4e56e33197

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.24 / 2014-02-25
+
+* [improvement] Show recent information about filesystem, database and traffic
+  usage in `shelly info` output
+
 ## 0.4.23 / 2014-02-17
 
 * [improvement] Force pseudo-tty allocation when connection via ssh - fixes ssh

data/lib/shelly/app.rb

@@ -235,6 +235,10 @@ module Shelly
       @stats ||= shelly.statistics(code_name)
     end
 
+    def usage
+      @usage ||= shelly.usage(code_name)
+    end
+
     def system_user
       attributes["system_user"]
     end

data/lib/shelly/cli/main.rb

@@ -116,6 +116,17 @@ module Shelly
         print_wrapped "Repository URL: #{app.git_info["repository_url"]}", :ident => 2
         print_wrapped "Web server IP: #{app.web_server_ip}", :ident => 2
         say_new_line
+        print_wrapped "Usage:", :ident => 2
+        print_wrapped "Filesystem:", :ident => 4
+        print_wrapped "Current: #{app.usage['filesystem']['current']}", :ident => 6
+        print_wrapped "Average: #{app.usage['filesystem']['avg']}", :ident => 6
+        print_wrapped "Database:", :ident => 4
+        print_wrapped "Current: #{app.usage['database']['current']}", :ident => 6
+        print_wrapped "Average: #{app.usage['database']['avg']}", :ident => 6
+        print_wrapped "Traffic:", :ident => 4
+        print_wrapped "Incoming: #{app.usage['traffic']['incoming']}", :ident => 6
+        print_wrapped "Outgoing: #{app.usage['traffic']['outgoing']}", :ident => 6
+        say_new_line
         if app.statistics.present?
           print_wrapped "Statistics:", :ident => 2
           app.statistics.each do |stat|

data/lib/shelly/client/apps.rb

@@ -30,6 +30,10 @@ class Shelly::Client
     get("/apps/#{code_name}/statistics")
   end
 
+  def usage(code_name)
+    get("/apps/#{code_name}/usage")
+  end
+
   def command(cloud, body, type)
     post("/apps/#{cloud}/command", {:body => body, :type => type})
   end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.23"
+  VERSION = "0.4.24"
 end

data/spec/shelly/app_spec.rb

@@ -229,6 +229,31 @@ describe Shelly::App do
     end
   end
 
+  describe "#usage" do
+    before do
+      @response = {
+        "filesystem"  => {
+          "avg"     => "32 KiB",
+          "current" => "64 KiB"
+        },
+        "database" => {
+          "avg"     => "64 KiB",
+          "current" => "128 KiB"
+        },
+        "traffic" => {
+          "incoming"  => "32 KiB",
+          "outgoing"  => "64 KiB"
+        }
+      }
+      @client.stub(:usage).and_return(@response)
+    end
+
+    it "should fetch app usage from API and cache them" do
+      @client.should_receive(:usage).with("foo-staging").exactly(:once).and_return(@response)
+      2.times { @app.usage }
+    end
+  end
+
   describe "#start & #stop" do
     it "should start cloud" do
       @client.should_receive(:start_cloud).with("foo-staging").

data/spec/shelly/cli/main_spec.rb

@@ -974,7 +974,22 @@ Wait until cloud is in 'turned off' state and try again.")
                       "swap" => {"kilobyte" => "44332", "percent" => "2.8"},
                       "cpu" => {"wait" => "0.8", "system" => "0.0", "user" => "0.1"},
                       "load" => {"avg15" => "0.13", "avg05" => "0.15", "avg01" => "0.04"}}]
+      @usage = {
+        "filesystem" => {
+          "avg"     => "32 KiB",
+          "current" => "64 KiB"
+        },
+        "database" => {
+          "avg"     => "64 KiB",
+          "current" => "128 KiB"
+        },
+        "traffic" => {
+          "incoming"  => "32 KiB",
+          "outgoing"  => "64 KiB"
+        }
+      }
       @app.stub(:statistics).and_return(@statistics)
+      @app.stub(:usage).and_return(@usage)
     end
 
     it "should ensure user has logged in" do
@@ -997,6 +1012,16 @@ Wait until cloud is in 'turned off' state and try again.")
         $stdout.should_receive(:puts).with("  Deployed by: megan@example.com")
         $stdout.should_receive(:puts).with("  Repository URL: git@winniecloud.net:example-cloud")
         $stdout.should_receive(:puts).with("  Web server IP: 22.22.22.22")
+        $stdout.should_receive(:puts).with("  Usage:")
+        $stdout.should_receive(:puts).with("    Filesystem:")
+        $stdout.should_receive(:puts).with("      Average: 32 KiB")
+        $stdout.should_receive(:puts).with("      Current: 64 KiB")
+        $stdout.should_receive(:puts).with("    Database:")
+        $stdout.should_receive(:puts).with("      Average: 64 KiB")
+        $stdout.should_receive(:puts).with("      Current: 128 KiB")
+        $stdout.should_receive(:puts).with("    Traffic:")
+        $stdout.should_receive(:puts).with("      Incoming: 32 KiB")
+        $stdout.should_receive(:puts).with("      Outgoing: 64 KiB")
         $stdout.should_receive(:puts).with("  Statistics:")
         $stdout.should_receive(:puts).with("    app1:")
         $stdout.should_receive(:puts).with("      Load average: 1m: 0.04, 5m: 0.15, 15m: 0.13")
@@ -1019,6 +1044,16 @@ Wait until cloud is in 'turned off' state and try again.")
             $stdout.should_receive(:puts).with("  Deployed by: megan@example.com")
             $stdout.should_receive(:puts).with("  Repository URL: git@winniecloud.net:example-cloud")
             $stdout.should_receive(:puts).with("  Web server IP: 22.22.22.22")
+            $stdout.should_receive(:puts).with("  Usage:")
+            $stdout.should_receive(:puts).with("    Filesystem:")
+            $stdout.should_receive(:puts).with("      Average: 32 KiB")
+            $stdout.should_receive(:puts).with("      Current: 64 KiB")
+            $stdout.should_receive(:puts).with("    Database:")
+            $stdout.should_receive(:puts).with("      Average: 64 KiB")
+            $stdout.should_receive(:puts).with("      Current: 128 KiB")
+            $stdout.should_receive(:puts).with("    Traffic:")
+            $stdout.should_receive(:puts).with("      Incoming: 32 KiB")
+            $stdout.should_receive(:puts).with("      Outgoing: 64 KiB")
             $stdout.should_receive(:puts).with("  Statistics:")
             $stdout.should_receive(:puts).with("    app1:")
             $stdout.should_receive(:puts).with("      Load average: 1m: 0.04, 5m: 0.15, 15m: 0.13")
@@ -1041,6 +1076,16 @@ Wait until cloud is in 'turned off' state and try again.")
             $stdout.should_receive(:puts).with("  Deployed by: megan@example.com")
             $stdout.should_receive(:puts).with("  Repository URL: git@winniecloud.net:example-cloud")
             $stdout.should_receive(:puts).with("  Web server IP: 22.22.22.22")
+            $stdout.should_receive(:puts).with("  Usage:")
+            $stdout.should_receive(:puts).with("    Filesystem:")
+            $stdout.should_receive(:puts).with("      Average: 32 KiB")
+            $stdout.should_receive(:puts).with("      Current: 64 KiB")
+            $stdout.should_receive(:puts).with("    Database:")
+            $stdout.should_receive(:puts).with("      Average: 64 KiB")
+            $stdout.should_receive(:puts).with("      Current: 128 KiB")
+            $stdout.should_receive(:puts).with("    Traffic:")
+            $stdout.should_receive(:puts).with("      Incoming: 32 KiB")
+            $stdout.should_receive(:puts).with("      Outgoing: 64 KiB")
             $stdout.should_receive(:puts).with("  Statistics:")
             $stdout.should_receive(:puts).with("    app1:")
             $stdout.should_receive(:puts).with("      Load average: 1m: 0.04, 5m: 0.15, 15m: 0.13")

data/spec/shelly/client_spec.rb

@@ -243,6 +243,44 @@ describe Shelly::Client do
     end
   end
 
+  describe "#usage" do
+    before do
+      FakeWeb.register_uri(:get,
+                           api_url("apps/staging-foo/usage"),
+                           :body => {
+                             :filesystem => {
+                               :avg     => "32 KiB",
+                               :current => "64 KiB"
+                             },
+                             :database => {
+                               :avg     => "64 KiB",
+                               :current => "128 KiB"
+                             },
+                             :traffic    => {
+                               :incoming => "32 KiB",
+                               :outgoing => "64 KiB"
+                             }
+                           }.to_json)
+    end
+
+    it "should fetch application usage from API" do
+      expect(@client.usage("staging-foo")).to eq({
+        "filesystem" => {
+          "avg"     => "32 KiB",
+          "current" => "64 KiB"
+        },
+        "database" => {
+          "avg"     => "64 KiB",
+          "current" => "128 KiB"
+        },
+        "traffic" => {
+          "incoming"  => "32 KiB",
+          "outgoing"  => "64 KiB"
+        }
+      })
+    end
+  end
+
   describe "#command" do
     it "should send post request with app code_name, body and type" do
       @client.should_receive(:post).with("/apps/staging-foo/command",

metadata

@@ -1,211 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.23
+  version: 0.4.24
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  prerelease: false
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
-  prerelease: false
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
+        version: 0.4.3
+- !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.10
-  prerelease: false
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.10
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
+        version: 0.14.10
+- !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-  prerelease: false
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
+        version: '1.16'
+- !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - devs@shellycloud.com
@@ -214,8 +214,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -310,17 +310,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool