sshkit 0.0.19 → 0.0.21

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8db213100be25113e238342987c5a12ed7412b15
+  data.tar.gz: 7067bc10963a3d8f98f45711075418bed865c590
+SHA512:
+  metadata.gz: ab26645180f7f6ecc458735ec542b620024ee612d35738c0219d7add6a20fc7388e1b9f4c872370e9a2fb74dd100a7efc740d0b73d517b391a411b7f29104e92
+  data.tar.gz: f3f840a846d275c20ad325134eb37caa582cf20d7025bf15a69ca82c024ef10ee2c797505d26e4d7f284499b4a5707f46c2c783ac66534db9e2ccdad23fe4342

data/CHANGELOG.md

@@ -3,6 +3,20 @@
 This file is written in reverse chronological order, newer releases will
 appear at the top.
 
+## 0.0.21
+
+  * Fixed an issue with default formatter
+  * Modified SSHKit.config.output_verbosity= to accept different objects:
+
+        SSHKit.config.output_verbosity = Logger::INFO
+        SSHKit.config.output_verbosity = :info
+        SSHKit.config.output_verbosity = 1
+
+## 0.0.20
+
+ * Fixed a bug where the log level would be assigned, not compared in the
+   pretty formatter, breaking the remainder of the output verbosity.
+
 ## 0.0.19
 
  * Modified the `Pretty` formatter to include the log level in front of

data/README.md

@@ -1,10 +1,10 @@
-![SSHKit Logo](https://raw.github.com/wacku/sshkit/master/assets/images/logo.png)
+![SSHKit Logo](https://raw.github.com/leehambley/sshkit/master/assets/images/logo.png)
 
 **SSHKit** is a toolkit for running commands in a structured way on one or
 more servers.
 
-[![Build Status](https://travis-ci.org/wacku/sshkit.png?branch=master)](https://travis-ci.org/wacku/sshkit)
-[![Dependency Status](https://gemnasium.com/wacku/sshkit.png)](https://gemnasium.com/wacku/sshkit)
+[![Build Status](https://travis-ci.org/leehambley/sshkit.png?branch=master)](https://travis-ci.org/leehambley/sshkit)
+[![Dependency Status](https://gemnasium.com/leehambley/sshkit.png)](https://gemnasium.com/leehambley/sshkit)
 
 ## How might it work?
 
@@ -158,7 +158,7 @@ first argument before attempting to find it in the *command map*.
 
 ## Output Handling
 
-![Example Output](https://raw.github.com/wacku/sshkit/master/assets/images/example_output.png)
+![Example Output](https://raw.github.com/leehambley/sshkit/master/assets/images/example_output.png)
 
 The output handling comprises two objects, first is the output itself, by
 default this is *$stdout*, but can be any object responding to a

data/lib/sshkit/backends/netssh.rb

@@ -37,12 +37,14 @@ module SSHKit
         _execute(*[*args, options]).stdout.strip
       end
 
-      def configure
-        yield config
-      end
+      class << self
+        def configure
+          yield config
+        end
 
-      def config
-        @config ||= Configuration.new
+        def config
+          @config ||= Configuration.new
+        end
       end
 
       private
@@ -52,7 +54,7 @@ module SSHKit
           output << cmd
           cmd.started = true
           ssh.open_channel do |chan|
-            chan.request_pty if config.pty
+            chan.request_pty if Netssh.config.pty
             chan.exec cmd.to_command do |ch, success|
               chan.on_data do |ch, data|
                 cmd.stdout += data

data/lib/sshkit/configuration.rb

@@ -6,7 +6,7 @@ module SSHKit
     attr_writer :output, :backend, :default_env, :command_map
 
     def output
-      @output ||= format=(:pretty)
+      @output ||= formatter(:pretty)
     end
 
     def default_env
@@ -18,12 +18,15 @@ module SSHKit
     end
 
     def output_verbosity
-      @output_verbosity ||= Logger::INFO
+      @output_verbosity ||= logger(:info)
+    end
+
+    def output_verbosity=(verbosity)
+      @output_verbosity = logger(verbosity)
     end
 
     def format=(format)
-      formatter = SSHKit::Formatter.const_get(format.capitalize)
-      self.output = formatter.new($stdout)
+      self.output = formatter(format)
     end
 
     def command_map
@@ -38,6 +41,16 @@ module SSHKit
       end
     end
 
+    private
+
+    def logger(verbosity)
+      verbosity.is_a?(Integer) ? verbosity : Logger.const_get(verbosity.upcase)
+    end
+
+    def formatter(format)
+      SSHKit::Formatter.const_get(format.capitalize).new($stdout)
+    end
+
   end
 
 end

data/lib/sshkit/formatters/pretty.rb

@@ -13,7 +13,7 @@ module SSHKit
 
           unless obj.started?
             original_output << level(obj.verbosity) + uuid(obj) + "Running #{c.yellow(c.bold(String(obj)))} on #{c.blue(obj.host.to_s)}\n"
-            if SSHKit.config.output_verbosity = Logger::DEBUG
+            if SSHKit.config.output_verbosity == Logger::DEBUG
               original_output << level(Logger::DEBUG) + uuid(obj) + c.white("Command: #{c.blue(obj.to_command)}") + "\n"
             end
           end

data/lib/sshkit/version.rb

@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "0.0.19"
+  VERSION = "0.0.21"
 end

data/test/unit/backends/test_netssh.rb

@@ -5,7 +5,7 @@ module SSHKit
     class TestNetssh < UnitTest
 
       def backend
-        @backend ||= Netssh.new(Host.new('example.com'))
+        @backend ||= Netssh
       end
 
       def test_net_ssh_configuration_options

data/test/unit/test_configuration.rb

@@ -23,7 +23,11 @@ module SSHKit
 
     def test_output_verbosity
       assert_equal Logger::INFO, SSHKit.config.output_verbosity
-      assert SSHKit.config.output_verbosity = Logger::DEBUG
+      assert SSHKit.config.output_verbosity = :debug
+      assert_equal Logger::DEBUG, SSHKit.config.output_verbosity
+      assert SSHKit.config.output_verbosity = Logger::INFO
+      assert_equal Logger::INFO, SSHKit.config.output_verbosity
+      assert SSHKit.config.output_verbosity = 0
       assert_equal Logger::DEBUG, SSHKit.config.output_verbosity
     end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 0.0.19
-  prerelease: 
+  version: 0.0.21
 platform: ruby
 authors:
 - Lee Hambley
@@ -10,46 +9,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.3
     - - <
@@ -58,9 +52,8 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.3
     - - <
@@ -69,145 +62,127 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: autotest
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: unindent
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vagrant
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A comprehensive toolkit for remotely running commands in a structured
@@ -269,27 +244,26 @@ files:
 - test/unit/test_host.rb
 homepage: http://wacku.github.com/sshkit
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SSHKit makes it easy to write structured, testable SSH commands in Ruby
 test_files:
 - test/functional/backends/test_netssh.rb
@@ -303,4 +277,3 @@ test_files:
 - test/unit/test_configuration.rb
 - test/unit/test_coordinator.rb
 - test/unit/test_host.rb
-has_rdoc: