shelly 0.4.30 → 0.4.31

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 08f4c5b1816282bda6bfd4b66605efe25fbc739c
-  data.tar.gz: 2f0e18aab9fc1a5a19096c9ba3682c1ae0e99cad
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzAwNGQyNWM4YTM1ZGM3YmY2ZGUwMzIzOTNiNmM3YTc5M2QwMjE3Mg==
+  data.tar.gz: !binary |-
+    YzBhZmRmY2QzOGExOTQ3MzA5MjM1NjA1MGVjYTMxOWEzODc1M2ZjNw==
 SHA512:
-  metadata.gz: af1e79cc70081ab911b95bf40b7acdff0d8eb7a7a2fd68eff7f27cf470c9818693fe727c3168fdfc34a2504c556ae087e8122702c99e28cbb2657db6ee8810d5
-  data.tar.gz: 07846a4da96ee42fba0f9b72232b3d2d2818c648cd3ec26b19c0e643eced8a05a03d9d3c206c8582916983c162b58d00c8efad2e237d914b2b34d31ce3ba385f
+  metadata.gz: !binary |-
+    NjlhMjNjMTdiNThmYTk0MDcyNDdiNTMxYTM4NWQ2ZjFiZTM2NmVhM2ViY2Fi
+    ODQzMGU5MGEwMTQxMDg2MTIzMTI3ZWI3M2I4OTU4Y2M2MDJhMTM1ZjZmYmU0
+    YWUyZWM3MDNlY2FiYzdkNmVlZWE1N2Q4YTA4N2U4MjBhOTljYjY=
+  data.tar.gz: !binary |-
+    YzU0YjcxZWFiNWYyNzRhMmJmMzlkYmYxMDQwOGFjOTEzNzliZjlmMjQ5Zjll
+    OTZjZjllOGQ5NWU3NDZmZjI3MGNjMWZiYjk0MDljMDExNGM1NGUwNjVmZTkz
+    NjUxZjlhY2RkMjRhMTZiYjI5ZGJlNzViMTQzY2VmYzlkNThlNDk=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.31 / 2014-04-21
+
+* [improvement] Let users download logs for current day with
+  `shelly logs download`
+
 ## 0.4.30 / 2014-04-14
 
 * [feature] `shelly config create` will check if config already exists in

data/lib/shelly/cli/backup.rb

@@ -50,6 +50,7 @@ module Shelly
         backup = app.database_backup(handler)
         bar = Shelly::DownloadProgressBar.new(backup.size)
         backup.download(bar.progress_callback)
+        bar.finish
 
         say_new_line
         say "Backup file saved to #{backup.filename}", :green

data/lib/shelly/cli/logs.rb

@@ -33,13 +33,13 @@ module Shelly
 
       map "download" => :get
       desc "get [DATE]", "Download log file from a specific date"
-      def get(date = "yesterday")
+      def get(date = "today")
         app = multiple_clouds(options[:cloud], "logs get #{date}")
 
         attributes = app.download_application_logs_attributes({:date => date})
-        bar = Shelly::DownloadProgressBar.new(attributes["size"])
-
+        bar = Shelly::DownloadProgressBar.new
         app.download_application_logs(attributes, bar.progress_callback)
+        bar.finish
 
         say_new_line
         say "Log file saved to #{attributes["filename"]}", :green

data/lib/shelly/client.rb

@@ -52,9 +52,13 @@ module Shelly
     def download_file(cloud, filename, url, progress_callback = nil)
       File.open(filename, "wb") do |out|
         process_response = lambda do |response|
+
+          total_size = response.to_hash['file-size'].first.to_i if response.to_hash['file-size']
           response.read_body do |chunk|
             out.write(chunk)
-            progress_callback.call(chunk.size) if progress_callback
+
+            progress_callback.call(chunk.size,
+              total_size) if progress_callback
           end
         end
 

data/lib/shelly/client/application_logs.rb

@@ -15,12 +15,6 @@ class Shelly::Client
   end
 
   def download_application_logs_attributes(code_name, options)
-    attributes = get("/apps/#{code_name}/application_logs/download#{query(options)}")
-    headers = RestClient::Request.execute({
-      :method => :get,
-      :url => "#{attributes["url"]}/headers"
-    }.merge(http_basic_auth_options)).headers
-
-    attributes.merge("size" => headers[:content_lenght].to_i)
+    get("/apps/#{code_name}/application_logs/download#{query(options)}")
   end
 end

data/lib/shelly/download_progress_bar.rb

@@ -1,14 +1,16 @@
-require "progressbar"
+require "ruby-progressbar"
 
 module Shelly
-  class DownloadProgressBar < ProgressBar
-    def initialize(total)
-      super("Progress", total)
-      self.format_arguments = [:title, :percentage, :bar, :stat_for_file_transfer]
+  class DownloadProgressBar < ProgressBar::Base
+    def initialize(total = nil)
+      super(:title => "Progress", :total => total, :format => "%a [%B] %p%% %t | %E")
     end
 
     def progress_callback
-      lambda { |size| inc(size) }
+      lambda { |inc_size, total_size|
+        self.total = total_size if total_size
+        self.progress = progress + inc_size
+      }
     end
   end
 end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.30"
+  VERSION = "0.4.31"
 end

data/shelly.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "mime-types", "~> 1.16"
   s.add_runtime_dependency "json"
-  s.add_runtime_dependency "progressbar"
+  s.add_runtime_dependency "ruby-progressbar"
   s.add_runtime_dependency "launchy"
   s.add_runtime_dependency "netrc"
   s.add_runtime_dependency "childprocess"

data/spec/shelly/cli/backup_spec.rb

@@ -69,7 +69,7 @@ describe Shelly::CLI::Backup do
     describe "#get" do
       before do
         @client.stub(:download_file)
-        @bar = mock(:progress_callback => @callback)
+        @bar = mock(:progress_callback => @callback, :finish => true)
         Shelly::DownloadProgressBar.stub(:new).and_return(@bar)
         @client.stub(:database_backup).and_return({"filename" => "better.tar.gz", "size" => 12345})
         @client.stub(:download_backup_url).with("foo-staging", "better.tar.gz").

data/spec/shelly/cli/logs_spec.rb

@@ -66,7 +66,7 @@ describe Shelly::CLI::Logs do
 
   describe "#get" do
     before do
-      @bar = mock(:progress_callback => @callback)
+      @bar = mock(:progress_callback => @callback, :finish => true)
       Shelly::DownloadProgressBar.stub(:new).and_return(@bar)
       @client.stub(:download_application_logs_attributes).
         with("foo-production", {:date => "2013-05-31"}).
@@ -100,7 +100,7 @@ describe Shelly::CLI::Logs do
       @client.should_receive(:download_file).
         with("foo-production", "foo-production.log.20130531.gz",
              "http://example.com/foo-production/20130531", @callback)
-      Shelly::DownloadProgressBar.should_receive(:new).with(12345).and_return(@bar)
+      Shelly::DownloadProgressBar.should_receive(:new).and_return(@bar)
       invoke(@cli_logs, :get, "2013-05-31")
     end
 

data/spec/shelly/client_spec.rb

@@ -352,6 +352,7 @@ describe Shelly::Client do
       @url = "https://#{CGI.escape(email)}:#{api_key}@backup.example.com/file.gz"
       response = Net::HTTPResponse.new('', '', '')
       # Streaming
+      response.stub(:to_hash).and_return({'file-size' => ['1000']})
       response.stub(:read_body).and_yield("aaa").and_yield("bbbbb").and_yield("dddf")
       FakeWeb.register_uri(:get, @url, :response => response)
     end
@@ -363,11 +364,11 @@ describe Shelly::Client do
 
     it "should execute progress_callback with size of every chunk" do
       progress = mock(:update => true)
-      progress.should_receive(:update).with(3)
-      progress.should_receive(:update).with(5)
-      progress.should_receive(:update).with(4)
+      progress.should_receive(:update).with(3, 1000)
+      progress.should_receive(:update).with(5, 1000)
+      progress.should_receive(:update).with(4, 1000)
 
-      callback = lambda { |size| progress.update(size) }
+      callback = lambda { |size, total| progress.update(size, total) }
 
       @client.download_file("foo", @filename, @url, callback)
     end

data/spec/shelly/download_progress_bar_spec.rb

@@ -3,26 +3,25 @@ require "shelly/download_progress_bar"
 
 describe Shelly::DownloadProgressBar do
   before do
-    $stderr.stub(:print)
+    $stdout.stub(:print)
     @bar = Shelly::DownloadProgressBar.new(4444)
   end
 
   it "should inherith from ProgressBar" do
-    @bar.should be_kind_of(ProgressBar)
+    @bar.should be_kind_of(ProgressBar::Base)
   end
 
-  it "should initialize parent with header and given size" do
-    @bar.title.should == "Progress"
+  it "should initialize parent with size" do
     @bar.total.should == 4444
   end
 
   describe "#progress_callback" do
     it "should return callback for updating progress bar" do
-      @bar.should_receive(:inc).with(10)
-      @bar.should_receive(:inc).with(20)
+      @bar.should_receive(:total=).with(1000)
+      @bar.should_receive(:progress=).with(10)
 
-      @bar.progress_callback.call(10)
-      @bar.progress_callback.call(20)
+
+      @bar.progress_callback.call(10, 1000)
     end
   end
 end

metadata

@@ -1,237 +1,237 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.30
+  version: 0.4.31
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         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
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         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
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: json
   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'
 - !ruby/object:Gem::Dependency
-  name: progressbar
+  name: ruby-progressbar
   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'
 - !ruby/object:Gem::Dependency
   name: launchy
   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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: childprocess
   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
@@ -242,8 +242,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -338,12 +338,12 @@ 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: []