shelly 0.1.36 → 0.1.37.pre

data/lib/shelly/app.rb

@@ -80,6 +80,10 @@ module Shelly
       shelly.application_logs(code_name, options)
     end
 
+    def application_logs_tail
+      shelly.application_logs_tail(code_name) { |l| yield(l) }
+    end
+
     def database_backups
       shelly.database_backups(code_name).map do |attributes|
         Shelly::Backup.new(attributes.merge("code_name" => code_name))

data/lib/shelly/cli/main.rb

@@ -305,13 +305,9 @@ We have been notified about it. We will be adding new resources shortly}
         print_logs(logs)
 
         if options[:tail]
-          loop do
-            logs = app.application_logs(:from => logs['range']['last'],
-              :source => options[:source])
-            print_logs(logs)
-            sleep 0.5
-          end
+          app.application_logs_tail { |logs| print logs }
         end
+
       rescue Client::APIException => e
         raise e unless e.status_code == 416
         say_error "You have requested too many log messages. Try a lower number."

data/lib/shelly/client.rb

@@ -161,6 +161,17 @@ module Shelly
       get("/apps/#{cloud}/application_logs#{query(options)}")
     end
 
+    def application_logs_tail(cloud)
+      url = get("/apps/#{cloud}/application_logs/tail")["url"]
+      options = {
+        :url            => url,
+        :method         => :get,
+        :timeout        => 60 * 60 * 24,
+        :block_response => Proc.new { |r| r.read_body { |c| yield(c) } }
+      }.merge(http_basic_auth_options)
+      RestClient::Request.execute(options)
+    end
+
     def database_backups(code_name)
       get("/apps/#{code_name}/database_backups")
     end

data/lib/shelly/helpers.rb

@@ -120,7 +120,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository}
 
     def print_logs(logs)
       logs['entries'].each do |entry|
-        say "%8.8s | %s\n" % entry
+        say "%s %s" % entry
       end
     end
 

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.36"
+  VERSION = "0.1.37.pre"
 end

data/spec/shelly/app_spec.rb

@@ -438,4 +438,13 @@ describe Shelly::App do
       @app.whenever?.should be_false
     end
   end
+
+  describe "#application_logs_tail" do
+    it "should execute given block for logs fetched from API" do
+      @client.should_receive(:application_logs_tail).with("foo-staging").and_yield("GET / 127.0.0.1")
+      out = ""
+      @app.application_logs_tail { |logs| out << logs }
+      out.should == "GET / 127.0.0.1"
+    end
+  end
 end

data/spec/shelly/cli/main_spec.rb

@@ -1193,8 +1193,8 @@ We have been notified about it. We will be adding new resources shortly")
 
     it "should show logs for the cloud" do
       @client.stub(:application_logs).and_return(@sample_logs)
-      $stdout.should_receive(:puts).with("    app1 | log1\n")
-      $stdout.should_receive(:puts).with("    app1 | log2\n")
+      $stdout.should_receive(:puts).with("app1 log1")
+      $stdout.should_receive(:puts).with("app1 log2")
       invoke(@main, :logs)
     end
 

data/spec/shelly/client_spec.rb

@@ -348,6 +348,27 @@ describe Shelly::Client do
     end
   end
 
+  describe "#application_logs_tail" do
+    before do
+      FakeWeb.register_uri(:get, api_url("apps/fooo/application_logs/tail"),
+        :body => {"url" => "http://logs.example.com/fooo"}.to_json)
+    end
+
+    it "should fetch tail url" do
+      FakeWeb.register_uri(:get, "http://bob%40example.com:secret@logs.example.com/fooo",
+        :body => {}.to_json)
+      @client.application_logs_tail("fooo") { }
+    end
+
+    it "should execute block for received data" do
+      FakeWeb.register_uri(:get, "http://bob%40example.com:secret@logs.example.com/fooo",
+        :body => "GET / 127.0.0.1")
+      out = ""
+      @client.application_logs_tail("fooo") { |logs| out << logs }
+      out.should == "GET / 127.0.0.1"
+    end
+  end
+
   describe "#request_parameters" do
     it "should return hash of resquest parameters" do
       expected = {

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.36
-  prerelease: 
+  version: 0.1.37.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Shelly Cloud team
@@ -349,16 +349,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1906837567373860011
+      hash: 4092670443477864760
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1906837567373860011
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.24