shelly 0.2.26 → 0.2.27

data/CHANGELOG.md

@@ -1,4 +1,9 @@
+## 0.2.27 / 2013-06-11
+
+* [feature] user is able to download logs for a given day by `shelly logs get [DATE]`
+
 ## 0.2.26 / 2013-06-10
+
 * [bug] `shelly backup import` now actually compresses the file (bzip2 is used)
 * [improvement] `shelly backup import` also accepts path to dump file
 

data/lib/shelly/app.rb

@@ -105,6 +105,14 @@ module Shelly
       shelly.application_logs_tail(code_name) { |l| yield(l) }
     end
 
+    def download_application_logs_attributes(date)
+      shelly.download_application_logs_attributes(code_name, date)
+    end
+
+    def download_application_logs(options, callback)
+      shelly.download_file(code_name, options["filename"], options["url"], callback)
+    end
+
     def database_backups
       shelly.database_backups(code_name).map do |attributes|
         Shelly::Backup.new(attributes.merge("code_name" => code_name))

data/lib/shelly/backup.rb

@@ -13,7 +13,8 @@ module Shelly
     end
 
     def download(callback)
-      shelly.download_backup(code_name, filename, callback)
+      url = shelly.download_backup_url(code_name, filename)
+      shelly.download_file(code_name, filename, url, callback)
     end
   end
 end

data/lib/shelly/cli/logs.rb

@@ -0,0 +1,53 @@
+require "shelly/cli/command"
+
+module Shelly
+  module CLI
+    class Logs < Command
+      namespace :logs
+      include Helpers
+
+      before_hook :logged_in?, :only => [:latest, :get]
+      class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+
+      desc "latest", "Show latest application logs"
+      method_option :limit, :type => :numeric, :aliases => "-n", :desc => "Amount of messages to show"
+      method_option :from, :type => :string, :desc => "Time from which to find the logs"
+      method_option :source, :type => :string, :aliases => "-s", :desc => "Limit logs to a single source, e.g. nginx"
+      method_option :tail, :type => :boolean, :aliases => "-f", :desc => "Show new logs automatically"
+      def latest
+        app = multiple_clouds(options[:cloud], "logs latest")
+        limit = options[:limit].to_i <= 0 ? 100 : options[:limit]
+        query = {:limit => options[:limit], :source => options[:source]}
+        query.merge!(:from => options[:from]) if options[:from]
+
+        logs = app.application_logs(query)
+        print_logs(logs)
+
+        if options[:tail]
+          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."
+      end
+
+      map "download" => :get
+      desc "get [DATE]", "Download log file from a specific date"
+      def get(date = "yesterday")
+        app = multiple_clouds(options[:cloud], "logs get #{date}")
+
+        attributes = app.download_application_logs_attributes({:date => date})
+        bar = Shelly::DownloadProgressBar.new(attributes["size"])
+
+        app.download_application_logs(attributes, bar.progress_callback)
+
+        say_new_line
+        say "Log file saved to #{attributes["filename"]}", :green
+      rescue RestClient::ResourceNotFound => e
+        say_error "Log file not found", :with_exit => false
+      rescue Client::ValidationException => e
+        e.each_error { |error| say_error error, :with_exit => false }
+      end
+    end
+  end
+end

data/lib/shelly/cli/main.rb

@@ -6,6 +6,7 @@ require "shelly/cli/deploy"
 require "shelly/cli/config"
 require "shelly/cli/file"
 require "shelly/cli/organization"
+require "shelly/cli/logs"
 
 module Shelly
   module CLI
@@ -16,11 +17,12 @@ module Shelly
       register_subcommand(Config, "config", "config <command>", "Manage application configuration files")
       register_subcommand(File, "file", "file <command>", "Upload and download files to and from persistent storage")
       register_subcommand(Organization, "organization", "organization <command>", "View organizations")
+      register_subcommand(Logs, "logs", "logs <command>", "View application logs")
 
       check_unknown_options!(:except => :rake)
 
       # FIXME: it should be possible to pass single symbol, instead of one element array
-      before_hook :logged_in?, :only => [:add, :status, :list, :start, :stop, :logs, :delete, :info, :ip, :logout, :execute, :rake, :setup, :console, :dbconsole]
+      before_hook :logged_in?, :only => [:add, :status, :list, :start, :stop, :delete, :info, :ip, :logout, :execute, :rake, :setup, :console, :dbconsole]
       before_hook :inside_git_repository?, :only => [:add, :setup, :check]
 
       map %w(-v --version) => :version
@@ -315,31 +317,6 @@ Wait until cloud is in 'turned off' state and try again.}
         say_error e[:message]
       end
 
-      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 :from, :type => :string, :desc => "Time from which to find the logs"
-      method_option :source, :type => :string, :aliases => "-s", :desc => "Limit logs to a single source, e.g. nginx"
-      method_option :tail, :type => :boolean, :aliases => "-f", :desc => "Show new logs automatically"
-      def logs
-        cloud = options[:cloud]
-        app = multiple_clouds(cloud, "logs")
-        limit = options[:limit].to_i <= 0 ? 100 : options[:limit]
-        query = {:limit => limit, :source => options[:source]}
-        query.merge!(:from => options[:from]) if options[:from]
-
-        logs = app.application_logs(query)
-        print_logs(logs)
-
-        if options[:tail]
-          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."
-      end
-
       desc "logout", "Logout from Shelly Cloud"
       def logout
         user = Shelly::User.new

data/lib/shelly/client.rb

@@ -174,6 +174,16 @@ module Shelly
       RestClient::Request.execute(options)
     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)
+    end
+
     def database_backups(code_name)
       get("/apps/#{code_name}/database_backups")
     end
@@ -227,7 +237,7 @@ module Shelly
       request(path, :delete, params)
     end
 
-    def download_backup(cloud, filename, progress_callback = nil)
+    def download_file(cloud, filename, url, progress_callback = nil)
       File.open(filename, "wb") do |out|
         process_response = lambda do |response|
           response.read_body do |chunk|
@@ -237,7 +247,7 @@ module Shelly
         end
 
         options = {
-          :url            => download_backup_url(cloud, filename),
+          :url            => url,
           :method         => :get,
           :block_response => process_response,
           :headers => {:accept => "application/x-gzip"}

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.26"
+  VERSION = "0.2.27"
 end

data/spec/shelly/backup_spec.rb

@@ -5,6 +5,7 @@ describe Shelly::Backup do
   before do
     @client = mock
     Shelly::Client.stub(:new).and_return(@client)
+    @client.stub(:download_backup_url).and_return("https://backups.example.com")
   end
 
   it "should assign attributes" do
@@ -20,7 +21,9 @@ describe Shelly::Backup do
   describe "#download" do
     it "should download given backup via API file with filename to which backup will be downloaded" do
       callback = lambda {}
-      @client.should_receive(:download_backup).with("foo", "backup.tar.gz", callback)
+      @client.should_receive(:download_backup_url).with("foo", "backup.tar.gz")
+      @client.should_receive(:download_file).with("foo", "backup.tar.gz",
+                                                  "https://backups.example.com", callback)
       backup = Shelly::Backup.new(attributes)
       backup.download(callback)
     end

data/spec/shelly/cli/backup_spec.rb

@@ -68,10 +68,12 @@ describe Shelly::CLI::Backup do
 
     describe "#get" do
       before do
-        @client.stub(:download_backup)
+        @client.stub(:download_file)
         @bar = mock(:progress_callback => @callback)
         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").
+          and_return("https://backups.example.com")
         $stdout.stub(:puts)
       end
 
@@ -80,33 +82,40 @@ describe Shelly::CLI::Backup do
       end
 
       it "should have a 'download' alias" do
-        @client.should_receive(:download_backup).with("foo-staging", "better.tar.gz", @bar.progress_callback)
+        @client.should_receive(:download_file).with("foo-staging", "better.tar.gz",
+                                                    "https://backups.example.com",
+                                                    @bar.progress_callback)
         invoke(@backup, :download, "better.tar.gz")
       end
 
       # multiple_clouds is tested in main_spec.rb in describe "#start" block
       it "should ensure multiple_clouds check" do
+        @client.should_receive(:download_backup_url).with("foo-staging", "better.tar.gz")
         @client.should_receive(:database_backup).with("foo-staging", "last")
         @backup.should_receive(:multiple_clouds).and_return(@app)
         invoke(@backup, :get)
       end
 
       it "should fetch backup size and initialize download progress bar" do
-        @client.stub(:database_backup).and_return({"filename" => "backup.postgres.tar.gz", "size" => 333})
+        @client.stub(:database_backup).and_return({"filename" => "better.tar.gz", "size" => 333})
         Shelly::DownloadProgressBar.should_receive(:new).with(333).and_return(@bar)
 
         invoke(@backup, :get)
       end
 
       it "should fetch given backup file itself" do
-        @client.should_receive(:download_backup).with("foo-staging", "better.tar.gz", @bar.progress_callback)
+        @client.should_receive(:download_file).with("foo-staging", "better.tar.gz",
+                                                    "https://backups.example.com",
+                                                    @bar.progress_callback)
         invoke(@backup, :get, "better.tar.gz")
       end
 
       it "should show info where file has been saved" do
         $stdout.should_receive(:puts)
         $stdout.should_receive(:puts).with(green "Backup file saved to better.tar.gz")
-        @client.should_receive(:download_backup).with("foo-staging", "better.tar.gz", @bar.progress_callback)
+        @client.should_receive(:download_file).with("foo-staging", "better.tar.gz",
+                                                    "https://backups.example.com",
+                                                    @bar.progress_callback)
         invoke(@backup, :get, "last")
       end
 

data/spec/shelly/cli/logs_spec.rb

@@ -0,0 +1,144 @@
+require "spec_helper"
+require "shelly/cli/logs"
+require "shelly/download_progress_bar"
+
+describe Shelly::CLI::Logs do
+  before do
+    @cli_logs = Shelly::CLI::Logs.new
+    Shelly::CLI::Logs.stub(:new).and_return(@cli_logs)
+    @client = mock
+    Shelly::Client.stub(:new).and_return(@client)
+    @client.stub(:token).and_return("abc")
+    FileUtils.mkdir_p("/projects/foo")
+    Dir.chdir("/projects/foo")
+    @app = Shelly::App.new("foo-production")
+    Shelly::App.stub(:new).and_return(@app)
+    File.open("Cloudfile", 'w') { |f| f.write("foo-production:\n") }
+    $stdout.stub(:puts)
+    $stdout.stub(:print)
+  end
+
+  describe "#latest" do
+    before do
+      @sample_logs = {"entries" => [['app1', 'log1'], ['app1', 'log2']]}
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@cli_logs, :latest).should include(:logged_in?)
+    end
+
+    it "should ensure multiple_clouds check" do
+      @client.stub(:application_logs).and_return(@sample_logs)
+      @cli_logs.should_receive(:multiple_clouds).and_return(@app)
+      invoke(@cli_logs, :latest)
+    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(@cli_logs, :latest) }.should raise_error(SystemExit)
+    end
+
+    it "should show logs for the cloud" do
+      @client.stub(:application_logs).and_return(@sample_logs)
+      $stdout.should_receive(:puts).with("app1 log1")
+      $stdout.should_receive(:puts).with("app1 log2")
+      invoke(@cli_logs, :latest)
+    end
+
+    it "should show requested amount of logs" do
+      @client.should_receive(:application_logs).
+        with("foo-production", {:limit => 2, :source => 'nginx'}).and_return(@sample_logs)
+      @cli_logs.options = {:limit => 2, :source => 'nginx'}
+      invoke(@cli_logs, :latest)
+    end
+
+    it "should show logs since 2013-05-07" do
+      @client.should_receive(:application_logs).
+        with("foo-production", {:from => '2013-05-07', :source => 'nginx', :limit => 2}).
+        and_return(@sample_logs)
+      @cli_logs.options = {:from => '2013-05-07', :source => 'nginx', :limit => 2}
+      invoke(@cli_logs, :latest)
+    end
+  end
+
+  describe "#get" do
+    before do
+      @bar = mock(:progress_callback => @callback)
+      Shelly::DownloadProgressBar.stub(:new).and_return(@bar)
+      @client.stub(:download_application_logs_attributes).
+        with("foo-production", {:date => "2013-05-31"}).
+        and_return({"filename" => "foo-production.log.20130531.gz",
+                   "url" => "http://example.com/foo-production/20130531",
+                   "size" => 12345})
+      $stdout.stub(:puts)
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@cli_logs, :get).should include(:logged_in?)
+    end
+
+    it "should ensure multiple_clouds check" do
+      @client.stub(:download_file).
+        with("foo-production", "foo-production.log.20130531.gz",
+             "http://example.com/foo-production/20130531", @callback)
+      @cli_logs.should_receive(:multiple_clouds).and_return(@app)
+      invoke(@cli_logs, :get, "2013-05-31")
+    end
+
+    it "should have a 'download' alias" do
+      @client.should_receive(:download_file).
+        with("foo-production", "foo-production.log.20130531.gz",
+             "http://example.com/foo-production/20130531", @callback)
+      invoke(@cli_logs, :download, "2013-05-31")
+    end
+
+
+    it "should fetch filename, url and size and initialize download progress bar" 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)
+      invoke(@cli_logs, :get, "2013-05-31")
+    end
+
+    it "should fetch given log file itself" do
+      @client.should_receive(:download_file).
+        with("foo-production", "foo-production.log.20130531.gz",
+             "http://example.com/foo-production/20130531",
+             @callback)
+      invoke(@cli_logs, :get, "2013-05-31")
+    end
+
+    it "should show info where file has been saved" do
+      $stdout.should_receive(:puts)
+      $stdout.should_receive(:puts).with(green "Log file saved to foo-production.log.20130531.gz")
+      @client.should_receive(:download_file).
+        with("foo-production", "foo-production.log.20130531.gz",
+             "http://example.com/foo-production/20130531",
+             @callback)
+      invoke(@cli_logs, :get, "2013-05-31")
+    end
+
+    context "on log file not found" do
+      it "should display error message" do
+        exception = RestClient::ResourceNotFound.new
+        @client.stub(:download_file).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "Log file not found")
+        invoke(@cli_logs, :get, "2013-05-31")
+      end
+    end
+
+    context "on invalid date format" do
+      it "should display error message" do
+        exception = Shelly::Client::ValidationException.new({
+          "errors" => [["Date", "format is invalid"]]})
+        @client.stub(:download_file).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "Date format is invalid")
+        invoke(@cli_logs, :get, "2013-05-31")
+      end
+    end
+  end
+end

data/spec/shelly/cli/main_spec.rb

@@ -41,7 +41,7 @@ describe Shelly::CLI::Main do
       out.should include("shelly list                    # List available clouds")
       out.should include("shelly login [EMAIL]           # Log into Shelly Cloud")
       out.should include("shelly logout                  # Logout from Shelly Cloud")
-      out.should include("shelly logs                    # Show latest application logs")
+      out.should include("shelly logs <command>          # View application logs")
       out.should include("shelly open                    # Open application page in browser")
       out.should include("shelly organization <command>  # View organizations")
       out.should include("shelly rake TASK               # Run rake task")
@@ -56,16 +56,6 @@ describe Shelly::CLI::Main do
       out.should include("-h, [--help]   # Describe available tasks or one specific task")
     end
 
-    it "should display options in help for logs" do
-      out = IO.popen("bin/shelly help logs").read.strip
-      out.should include("-c, [--cloud=CLOUD]    # Specify cloud")
-      out.should include("-n, [--limit=N]        # Amount of messages to show")
-      out.should include("-s, [--source=SOURCE]  # Limit logs to a single source, e.g. nginx")
-      out.should include("-f, [--tail]           # Show new logs automatically")
-      out.should include("[--from=FROM]      # Time from which to find the logs")
-      out.should include("[--debug]          # Show debug information")
-    end
-
     it "should display help when user is not logged in" do
       out = IO.popen("bin/shelly list --help").read.strip
       out.should include("Usage:")
@@ -1250,46 +1240,6 @@ Wait until cloud is in 'turned off' state and try again.")
     end
   end
 
-  describe "#logs" do
-    before do
-      setup_project
-      @sample_logs = {"entries" => [['app1', 'log1'], ['app1', 'log2']]}
-    end
-
-    it "should ensure user has logged in" do
-      hooks(@main, :logs).should include(:logged_in?)
-    end
-
-    # 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(@sample_logs)
-      @main.should_receive(:multiple_clouds).and_return(@app)
-      invoke(@main, :logs)
-    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(@sample_logs)
-      $stdout.should_receive(:puts).with("app1 log1")
-      $stdout.should_receive(:puts).with("app1 log2")
-      invoke(@main, :logs)
-    end
-
-    it "should show requested amount of logs" do
-      @client.should_receive(:application_logs).
-        with("foo-production", {:limit => 2, :source => 'nginx'}).and_return(@sample_logs)
-      @main.options = {:limit => 2, :source => 'nginx'}
-      invoke(@main, :logs)
-    end
-  end
-
   describe "#rake" do
     before do
       setup_project

data/spec/shelly/client_spec.rb

@@ -332,24 +332,18 @@ describe Shelly::Client do
     end
   end
 
-  describe "#download_backup" do
+  describe "#download_file" do
     before do
       @filename = "2011.11.26.04.00.10.foo.postgres.tar.gz"
-      @client.stub(:download_backup_url => "https://backup.example.com/file.gz")
+      @url = "https://bob%40example.com:secret@backup.example.com/file.gz"
       response = Net::HTTPResponse.new('', '', '')
       # Streaming
       response.stub(:read_body).and_yield("aaa").and_yield("bbbbb").and_yield("dddf")
-      FakeWeb.register_uri(:get, "https://bob%40example.com:secret@backup.example.com/file.gz
-", :response => response)
+      FakeWeb.register_uri(:get, @url, :response => response)
     end
 
-    it "should fetch from API backup url" do
-      @client.should_receive(:download_backup_url).with("foo", @filename)
-      @client.download_backup("foo", @filename)
-    end
-
-    it "should write streamed database backup to file" do
-      @client.download_backup("foo", @filename)
+    it "should write streamed data to file" do
+      @client.download_file("foo", @filename, @url)
       File.read(@filename).should == %w(aaa bbbbb dddf).join
     end
 
@@ -361,7 +355,7 @@ describe Shelly::Client do
 
       callback = lambda { |size| progress.update(size) }
 
-      @client.download_backup("foo", @filename, callback)
+      @client.download_file("foo", @filename, @url, callback)
     end
   end
 

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
+  version: 0.2.27
   prerelease: 
-  version: 0.2.26
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -29,13 +29,13 @@ dependencies:
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rake
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -45,13 +45,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -61,13 +61,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -77,45 +77,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby_gntp
   type: :development
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  type: :development
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -125,13 +93,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -141,13 +109,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -157,13 +125,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -173,13 +141,13 @@ dependencies:
         version: 0.14.9
 - !ruby/object:Gem::Dependency
   name: rest-client
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -189,13 +157,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -205,13 +173,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: progressbar
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -221,13 +189,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -262,6 +230,7 @@ files:
 - lib/shelly/cli/config.rb
 - lib/shelly/cli/deploy.rb
 - lib/shelly/cli/file.rb
+- lib/shelly/cli/logs.rb
 - lib/shelly/cli/main.rb
 - lib/shelly/cli/organization.rb
 - lib/shelly/cli/runner.rb
@@ -290,6 +259,7 @@ files:
 - spec/shelly/cli/config_spec.rb
 - spec/shelly/cli/deploy_spec.rb
 - spec/shelly/cli/file_spec.rb
+- spec/shelly/cli/logs_spec.rb
 - spec/shelly/cli/main_spec.rb
 - spec/shelly/cli/organization_spec.rb
 - spec/shelly/cli/runner_spec.rb
@@ -315,37 +285,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1915414309864831534
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1915414309864831534
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 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/backup_spec.rb
-- spec/shelly/cli/backup_spec.rb
-- spec/shelly/cli/config_spec.rb
-- spec/shelly/cli/deploy_spec.rb
-- spec/shelly/cli/file_spec.rb
-- spec/shelly/cli/main_spec.rb
-- spec/shelly/cli/organization_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/download_progress_bar_spec.rb
-- spec/shelly/model_spec.rb
-- spec/shelly/organization_spec.rb
-- spec/shelly/structure_validator_spec.rb
-- spec/shelly/user_spec.rb
-- spec/spec_helper.rb
-- spec/thor/options_spec.rb
+test_files: []