runssh 0.2.2 → 0.4.0

data/spec/runsshlib/ssh_host_def_spec.rb

@@ -77,7 +77,6 @@ describe 'SshHostDef' do
   context "to_print" do
     it "should run correctly without user" do
       h = RunSSHLib::SshHostDef.new('myhostname')
-      p h.to_print
       h.to_print.should match(/^.*host:.*myhostname\n.*login:.*current user$/)
     end
 
@@ -87,5 +86,10 @@ describe 'SshHostDef' do
       })
       h.to_print.should match(/^.*host:.*myhostname\n.*login:.*me$/)
     end
+
+    it "prints abbreviated local tunnel with full path" do
+      h = RunSSHLib::SshHostDef.new(:host_name => 'hostname', :local_tunnel => '7070')
+      h.to_print.should match(/local tunnel: 7070:localhost:7070/)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -16,75 +16,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 require 'rspec'
-require 'tmpdir'
+require %Q(#{File.join(File.dirname(__FILE__), "support", "utils")})
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
-# got the idea from:
-# http://stackoverflow.com/questions/1480537/how-can-i-validate-exits-and-aborts-in-rspec
-module ExitCodeMatchers
-  RSpec::Matchers.define :exit_normaly do
-    actual = nil
-    match do |block|
-      begin
-        block.call
-      rescue SystemExit => e
-        actual = e.status
-      end
-      actual and actual == 0
-    end
-    failure_message_for_should do |block|
-      "expected block to exit with code 0 but" +
-        (actual.nil? ? " exit was not called" : " exited with #{actual}")
-    end
-    failure_message_for_should_not do |block|
-      "expected code not to exit with code 0 but it did"
-    end
-    description do
-      "expect block to exit with code 0"
-    end
-  end
-
-  RSpec::Matchers.define :exit_abnormaly do
-    actual = nil
-    match do |block|
-      begin
-        block.call
-      rescue SystemExit => e
-        actual = e.status
-      end
-      actual and actual != 0
-    end
-    failure_message_for_should do |block|
-      "expected block to exit with code other then 0 but" +
-        (actual.nil? ? " exit was not called" : " exited with #{actual}")
-    end
-    failure_message_for_should_not do |block|
-      "expected code not to exit with code different then 0 but it did"
-    end
-    description do
-      "expect block to exit with code different then 0"
-    end
-  end
+require 'simplecov'
+SimpleCov.start do
+  add_group "Sources", "/lib/"
 end
 
 Rspec.configure do |c|
   c.mock_with :rspec
 end
-
-TMP_FILE = File.join(Dir.tmpdir, 'tempfile')
-
-def cleanup_tmp_file
-  File.delete TMP_FILE if File.exists? TMP_FILE
-  bf = TMP_FILE + '.bak'
-  File.delete bf if File.exists? bf
-end
-
-def import_fixtures
-  yml = File.join(File.dirname(__FILE__), 'fixtures', 'runssh.yml')
-  c = RunSSHLib::ConfigFile.new(TMP_FILE)
-  c.import(yml)
-end
-
-def dump_config hsh
-  File.open(TMP_FILE, 'w') { |out| Marshal.dump(hsh, out) }
-end

data/spec/support/utils.rb

@@ -0,0 +1,149 @@
+#
+# Copyright (C) 2010 Haim Ashkenazi
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+
+require 'tmpdir'
+
+# got the idea from:
+# http://stackoverflow.com/questions/1480537/how-can-i-validate-exits-and-aborts-in-rspec
+module ExitCodeMatchers
+  RSpec::Matchers.define :exit_normaly do
+    actual = nil
+    match do |block|
+      begin
+        block.call
+      rescue SystemExit => e
+        actual = e.status
+      end
+      actual and actual == 0
+    end
+    failure_message_for_should do |block|
+      "expected block to exit with code 0 but" +
+        (actual.nil? ? " exit was not called" : " exited with #{actual}")
+    end
+    failure_message_for_should_not do |block|
+      "expected code not to exit with code 0 but it did"
+    end
+    description do
+      "expect block to exit with code 0"
+    end
+  end
+
+  RSpec::Matchers.define :exit_abnormaly do
+    actual = nil
+    match do |block|
+      begin
+        block.call
+      rescue SystemExit => e
+        actual = e.status
+      end
+      actual and actual != 0
+    end
+    failure_message_for_should do |block|
+      "expected block to exit with code other then 0 but" +
+        (actual.nil? ? " exit was not called" : " exited with #{actual}")
+    end
+    failure_message_for_should_not do |block|
+      "expected code not to exit with code different then 0 but it did"
+    end
+    description do
+      "expect block to exit with code different then 0"
+    end
+  end
+end
+
+# Captures the requested stream (:stdout or :stderr) and
+# returns the result as string. It also populates the @buf
+# instance variable with it so it can be accessed in case
+# of system exit (e.g. die).
+# The stdin parameter is the content of the stdin. It's
+# required for any operation that reads from STDIN as the
+# default is empty.
+# Idea borrowed from the "Thor" gem (spec_help.rb).
+def capture(stream, stdin='')
+  begin
+    $stdin = StringIO.open(stdin, 'r')
+    @buf = ''
+    stream = stream.to_s
+    eval "$#{stream} = StringIO.open(@buf, 'w')"
+    yield
+  ensure
+    eval("$#{stream} = #{stream.upcase}")
+  end
+
+  @buf
+end
+
+TMP_FILE = File.join(Dir.tmpdir, 'tempfile')
+TMP_YML = TMP_FILE + '.yml'
+YML_FIXTURE = File.expand_path('../../fixtures/runssh.yml', __FILE__)
+KNOWN_HOSTS_FILE = File.join(Dir.tmpdir, 'known_hosts')
+
+def cleanup_tmp_file
+  File.delete TMP_FILE if File.exists? TMP_FILE
+  bf = TMP_FILE + '.bak'
+  File.delete bf if File.exists? bf
+  File.delete TMP_YML if File.exists? TMP_YML
+  File.delete KNOWN_HOSTS_FILE if File.exists? KNOWN_HOSTS_FILE
+end
+
+def import_fixtures
+  c = RunSSHLib::ConfigFile.new(TMP_FILE)
+  c.import(YML_FIXTURE)
+end
+
+def dump_config hsh
+  File.open(TMP_FILE, 'w') { |out| Marshal.dump(hsh, out) }
+end
+
+# retrive host definition from the database.
+# group is a string containing the path like in parameters for
+# command line.
+def get_host(group)
+  cf = RunSSHLib::ConfigFile.new(TMP_FILE)
+  cf.get_host(group.split.map { |e| e.to_sym })
+end
+
+# Instead of running 'ssh ...' it prints the command.
+def stub_ssh_exec
+  RunSSHLib::SshBackend.stub(:exec) do |_command, *args|
+    output = _command
+    output + args.join(" ") unless args.empty?
+    puts output
+  end
+end
+
+# known_hosts file for testing (with the specified host)
+def create_known_hosts_file(host)
+  File.open(KNOWN_HOSTS_FILE, 'w') do |io|
+    io.write("#{host} ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2f7VLQwGc6cc34HSra6ScQipZflsn59oVhfT0aTR08XYbQwNEbfeCL7IZVk6JWn4/kYUFmxCCwaxm/t47dex+ABnjuCeNboKLzbdDzeCiRvVtXvbjGFnaAgBGPL3Vu+7m4u59+b74a5tPQz+eRvr/jb4/fI0FssiaK+bdwfo37BD0p3c6fXI987+8F1RyDAoLS94G71+Ie47EGlj7xYvBD8RvFXtY5kaC8gNlc+sscuLqDvekJdfkwGD5F9M5kKpFQevneTk8T63+QU8mx7JJ8pNUEAi4ydAULDKRmhp/SteZfOnmcwx+jDk66Q9zXmhVUZDK4P/JwCXz5XFjgxgcw==\n")
+  end
+end
+
+# Checks whether a bookmark exists in TMP_FILE.
+# bookmark is a string representing a path. e.g,:
+# "some path to host"
+def bookmark_exist? bookmark
+  path = bookmark.split.map { |s| s.to_sym }
+  c = RunSSHLib::ConfigFile.new(TMP_FILE)
+  begin
+    result = c.send(:retrieve_path, path, "")
+    result ? true : false
+  rescue RunSSHLib::ConfigError => e
+    false
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runssh
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Haim Ashkenazi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 +02:00
+date: 2011-05-02 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,86 +50,6 @@ dependencies:
         version: 1.6.1
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: autotest
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 39
-        segments: 
-        - 4
-        - 4
-        - 4
-        version: 4.4.4
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: autotest-fsevent
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 2
-        - 3
-        version: 0.2.3
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: autotest-growl
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 2
-        - 6
-        version: 0.2.6
-  type: :development
-  version_requirements: *id007
 description: |
   Runssh is a command line utility to help bookmark many
   ssh connections in heirarchial groups.
@@ -152,6 +72,19 @@ files:
 - autotest/discover.rb
 - bin/runssh
 - bin/runssh_comp.sh
+- features/add_bookmarks.feature
+- features/cli_help.feature
+- features/copy_id.feature
+- features/delete_bookmarks.feature
+- features/export_bookmarks.feature
+- features/import_bookmarks.feature
+- features/print_bookmarks.feature
+- features/run_shell.feature
+- features/step_definitions/argument_steps.rb
+- features/step_definitions/bookmarks_steps.rb
+- features/step_definitions/output_steps.rb
+- features/support/env.rb
+- features/update_bookmarks.feature
 - gpl-2.0.txt
 - lib/runsshlib.rb
 - lib/runsshlib/cli.rb
@@ -167,6 +100,7 @@ files:
 - spec/runsshlib/ssh_backend_spec.rb
 - spec/runsshlib/ssh_host_def_spec.rb
 - spec/spec_helper.rb
+- spec/support/utils.rb
 has_rdoc: true
 homepage: http://github.com/babysnakes/runssh
 licenses: []
@@ -202,11 +136,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: CLI utility to bookmark multiple ssh connections with hierarchy.
 test_files: 
+- features/add_bookmarks.feature
+- features/cli_help.feature
+- features/copy_id.feature
+- features/delete_bookmarks.feature
+- features/export_bookmarks.feature
+- features/import_bookmarks.feature
+- features/print_bookmarks.feature
+- features/run_shell.feature
+- features/step_definitions/argument_steps.rb
+- features/step_definitions/bookmarks_steps.rb
+- features/step_definitions/output_steps.rb
+- features/support/env.rb
+- features/update_bookmarks.feature
 - spec/fixtures/runssh.yml
 - spec/fixtures/runssh_v_none.yml
 - spec/runsshlib/cli_spec.rb
@@ -214,3 +161,4 @@ test_files:
 - spec/runsshlib/ssh_backend_spec.rb
 - spec/runsshlib/ssh_host_def_spec.rb
 - spec/spec_helper.rb
+- spec/support/utils.rb