shelly 0.1.4.pre → 0.1.4.pre2

data/lib/shelly/app.rb

@@ -77,8 +77,8 @@ module Shelly
       shelly.deploy_log(code_name, log)
     end
 
-    def application_logs
-      shelly.application_logs(code_name)
+    def application_logs(options = {})
+      shelly.application_logs(code_name, options)
     end
 
     def database_backups

data/lib/shelly/cli/main.rb

@@ -259,19 +259,28 @@ We have been notified about it. We will be adding new resources shortly}
 
       desc "logs", "Show latest application logs"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+      method_option :limit, :type => :numeric, :aliases => "-n", :desc => "Amount of messages to show"
+      method_option :tail, :type => :boolean, :aliases => "-f", :desc => "Show new logs automatically"
       def logs
         cloud = options[:cloud]
         app = multiple_clouds(cloud, "logs")
         begin
-          logs = app.application_logs
-          say "Cloud #{app}:", :green
-          logs.each_with_index do |log, i|
-            say "Instance #{i+1}:", :green
-            say log
+          logs = app.application_logs(:limit => options[:limit])
+          print_logs(logs)
+
+          if options[:tail]
+            loop do
+              logs = app.application_logs(:from => logs['range']['last'])
+              print_logs(logs)
+              sleep 1
+            end
           end
         rescue Client::NotFoundException => e
           raise unless e.resource == :cloud
           say_error "You have no access to '#{cloud || app}' cloud defined in Cloudfile"
+        rescue Client::APIException => e
+          raise e unless e.status_code == 416
+          say_error "You have requested too many log messages. Try a lower number."
         end
       end
 

data/lib/shelly/client.rb

@@ -137,8 +137,10 @@ module Shelly
       get("/apps/#{cloud}/deployment_logs/#{log}")
     end
 
-    def application_logs(cloud)
-      get("/apps/#{cloud}/application_logs")
+    def application_logs(cloud, options = {})
+      query = "?" + options.map { |k, v|
+        URI.escape(k.to_s) + "=" + URI.escape(v.to_s) }.join("&")
+      get("/apps/#{cloud}/application_logs#{query}")
     end
 
     def database_backups(code_name)

data/lib/shelly/helpers.rb

@@ -114,5 +114,11 @@ module Shelly
       app.code_name = cloud || clouds.first
       app
     end
+
+    def print_logs(logs)
+      logs['entries'].each do |entry|
+        say "%8.8s | %s\n" % entry
+      end
+    end
   end
 end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.4.pre"
+  VERSION = "0.1.4.pre2"
 end

data/spec/shelly/app_spec.rb

@@ -292,8 +292,8 @@ config
 
   describe "#application_logs" do
     it "should list application_logs" do
-      @client.should_receive(:application_logs).with("foo-staging").
-        and_return({"logs" => ["log1", "log2"]})
+      @client.should_receive(:application_logs).with("foo-staging", {}).
+        and_return({"entries" => [["app1", "log1"], ["app2", "log2"]]})
       @app.application_logs
     end
   end

data/spec/shelly/cli/main_spec.rb

@@ -56,18 +56,11 @@ OUT
     end
 
     it "should display options in help for logs" do
-      expected = <<-OUT
-Usage:
-  shelly logs
-
-Options:
-  -c, [--cloud=CLOUD]  # Specify cloud
-      [--debug]        # Show debug information
-
-Show latest application logs
-OUT
       out = IO.popen("bin/shelly help logs").read.strip
-      out.should == expected.strip
+      out.should include("-c, [--cloud=CLOUD]  # Specify cloud")
+      out.should include("-n, [--limit=N]      # Amount of messages to show")
+      out.should include("-f, [--tail]         # Show new logs automatically")
+      out.should include("[--debug]        # Show debug information")
     end
   end
 
@@ -1070,6 +1063,7 @@ We have been notified about it. We will be adding new resources shortly")
                                      {"code_name" => "foo-staging"}])
       @app = Shelly::App.new
       Shelly::App.stub(:new).and_return(@app)
+      @sample_logs = {"entries" => [['app1', 'log1'], ['app1', 'log2']]}
     end
 
     it "should ensure user has logged in" do
@@ -1078,7 +1072,7 @@ We have been notified about it. We will be adding new resources shortly")
 
     # multiple_clouds is tested in main_spec.rb in describe "#start" block
     it "should ensure multiple_clouds check" do
-      @client.stub(:application_logs).and_return(["log1"])
+      @client.stub(:application_logs).and_return(@sample_logs)
       @main.should_receive(:multiple_clouds).and_return(@app)
       invoke(@main, :logs)
     end
@@ -1091,24 +1085,26 @@ We have been notified about it. We will be adding new resources shortly")
       lambda { invoke(@main, :logs) }.should raise_error(SystemExit)
     end
 
+    it "should exit if user requested too many log lines" do
+      exception = Shelly::Client::APIException.new({}, 416)
+      @client.stub(:application_logs).and_raise(exception)
+      $stdout.should_receive(:puts).
+        with(red "You have requested too many log messages. Try a lower number.")
+      lambda { invoke(@main, :logs) }.should raise_error(SystemExit)
+    end
+
     it "should show logs for the cloud" do
-      @client.stub(:application_logs).and_return(["log1"])
-      $stdout.should_receive(:puts).with(green "Cloud foo-production:")
-      $stdout.should_receive(:puts).with(green "Instance 1:")
-      $stdout.should_receive(:puts).with("log1")
+      @client.stub(:application_logs).and_return(@sample_logs)
+      $stdout.should_receive(:puts).with("    app1 | log1\n")
+      $stdout.should_receive(:puts).with("    app1 | log2\n")
       invoke(@main, :logs)
     end
 
-    context "multiple instances" do
-      it "should show logs from each instance" do
-        @client.stub(:application_logs).and_return(["log1", "log2"])
-        $stdout.should_receive(:puts).with(green "Cloud foo-production:")
-        $stdout.should_receive(:puts).with(green "Instance 1:")
-        $stdout.should_receive(:puts).with("log1")
-        $stdout.should_receive(:puts).with(green "Instance 2:")
-        $stdout.should_receive(:puts).with("log2")
-        invoke(@main, :logs)
-      end
+    it "should show requested amount of logs" do
+      @client.should_receive(:application_logs).
+        with("foo-production", {:limit => 2}).and_return(@sample_logs)
+      @main.options = {:limit => 2}
+      invoke(@main, :logs)
     end
   end
 

metadata

@@ -1,264 +1,250 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: shelly
-version: !ruby/object:Gem::Version
-  version: 0.1.4.pre
+version: !ruby/object:Gem::Version 
+  hash: -529809128
   prerelease: 6
+  segments: 
+  - 0
+  - 1
+  - 4
+  - pre
+  - 2
+  version: 0.1.4.pre2
 platform: ruby
-authors:
+authors: 
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-- !ruby/object:Gem::Dependency
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &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
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: guard
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &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
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &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: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &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: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   name: ruby_gntp
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &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: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &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: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   name: fakefs
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &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: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &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: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
   name: wijet-thor
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id010 !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: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.7
-- !ruby/object:Gem::Dependency
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id011 !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: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id012 !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: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
   name: progressbar
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id013 !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: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id013
+- !ruby/object:Gem::Dependency 
   name: launchy
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id014 !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: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id014
+- !ruby/object:Gem::Dependency 
   name: shelly-dependencies
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+  requirement: *id015
 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
@@ -311,29 +297,40 @@ 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
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: shelly
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 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