sshmenu 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 253c7a7f7a0a20ee5e3fa8a6da40e498caca810e
-  data.tar.gz: 5ed08912d8f8b1c44ab9513ff52714d17fd8a91c
+  metadata.gz: 8965529a56d459ff2f1e1697088fa5a5f6e31d50
+  data.tar.gz: b1f9a37eb1b8370506d0fcdc1bf9f92911752f65
 SHA512:
-  metadata.gz: 3e3f9297eed4d6d9cc4dca957d728eccb0008a782d95803f2564cb3e6fd57917422931e89967bd7298754b9f359aaf84c4c3d9519ed86f97f6a00e8f722591d6
-  data.tar.gz: ebc336f8a2453eb468bff10a6bcb956f2d166129059e9dde84a5de44afcf6536641c4c18ed595ee9a9006546eecfd3d6269fdd83b9993a2b1d26f0f259371431
+  metadata.gz: bb309e44d8c81ac1bfd58c40ef3d49d3e5eb6098610f4efb947a7115f3db95021c44f1af6517effdb973417834c65435eb3166618fd3c949f4967caebffd6ef9
+  data.tar.gz: 3ecc3a63b1e664b441db749d6997e3ea233a67ee2354e7483920fdf6a84591000bb40dfa984f162ce2f42c684f71130e54780ae8a67d51d390e53243341c9ca4

data/lib/sshmenu/actions.rb

@@ -10,22 +10,19 @@ module SshMenu
     end
 
     def edit
-      puts "Edit config file #{@config_file}"
-      exec("#{@general['editor']} #{@config_file}")
+      puts "Edit config file #@config_file"
+      exec("#{@general['editor']} #@config_file")
     end
 
     def connect(index)
-      unless index.between?(0, @connections.length-1)
-        raise ArgumentError, 'invalid index'
-      end
-
       conn = @connections[index]
 
-      opts = " #{@general['ssh_opts']}  #{conn['ssh_opts']}"
-      cmd = "#{@general['ssh_exec']}"
-      cmd << opts
-      cmd << " #{conn['user_host']}"
-
+      cmd = [@general['ssh_exec'],
+        @general['ssh_opts'],
+        conn['ssh_opts'],
+        conn['user_host']
+      ].join(' ')
+      puts "Command is #{cmd}" if $DEBUG
       puts "Connecting to #{conn['user_host']}"
       exec(cmd)
     end
@@ -34,9 +31,8 @@ module SshMenu
       editor = Config.default_editor
       config = Config.default_config_file
       print "Edit #{config} using default editor '#{editor}' [y/N]? "
-      if STDIN.getc =~ /\A[Yy]\z/
-        exec("#{editor} #{config}")
-      end
+
+      exec("#{editor} #{config}") if STDIN.getc[/[Yy]/]
     end
 
   end

data/lib/sshmenu/config.rb

@@ -22,7 +22,7 @@ module SshMenu
       @general = config['general']
       @connections = config['connections']
 
-      puts "Config is #{config.inspect}" if ENV['SSHMENU_DEBUG'].eql?('true')
+      puts "Config is #{config.inspect}" if $DEBUG
     rescue Psych::SyntaxError => e
       raise ConfigException, "YAML syntax error: #{e.message}"
     end
@@ -38,11 +38,11 @@ module SshMenu
     end
 
     def create_config_file(cfg_file)
-        puts "Create sample config file #{cfg_file}"
-        project_dir = File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))
-        sample_cfg = File.join(project_dir, 'data', 'sshmenu', 'sampleconfig.yml');
-        FileUtils.mkdir_p(File.dirname(cfg_file))
-        FileUtils.cp(sample_cfg, cfg_file)
+      puts "Create sample config file #{cfg_file}"
+      project_dir = File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))
+      sample_cfg = File.join(project_dir, 'data', 'sshmenu', 'sampleconfig.yml');
+      FileUtils.mkdir_p(File.dirname(cfg_file))
+      FileUtils.cp(sample_cfg, cfg_file)
     end
 
     def validate_config(config)
@@ -58,7 +58,7 @@ module SshMenu
     end
 
     def self.default_ssh_client
-     'ssh'
+      'ssh'
     end
 
     def self.default_editor

data/lib/sshmenu/options.rb

@@ -13,7 +13,7 @@ module SshMenu
         opts.banner << "add no arguments to show a list of configured connections"
 
         opts.on('-e', '--edit', 'edit configuration file') do |e|
-          @opts = @opts.merge({:action => :edit})
+          @opts[:action] = :edit
         end
 
         opts.on_tail('-v', '--version', 'print version') do
@@ -29,12 +29,10 @@ module SshMenu
 
       opt_parser.parse!(args)
 
-      unless args.first.nil?
-        begin
-          @opts = @opts.merge({:index => Integer(args.first) - 1})
-        rescue ArgumentError
-          raise "'#{args[0]}' expected to be a preselected index"
-        end
+      begin
+        @opts[:index] = Integer(args.first) - 1 if args.first
+      rescue ArgumentError
+        raise "'#{args.first}' expected to be a preselected index"
       end
     end
   end

data/lib/sshmenu/selector.rb

@@ -7,19 +7,25 @@ module SshMenu
 
     def select
       selection = request_selection
-      
+
       case selection
       when /\A[eE]\z/
         {:action => :edit}
-      when /\A[1-9][0-9]*\z/
-        {:index => Integer(selection) - 1 }
+      when (/\A[1-9][0-9]*\z/)
+        index = Integer(selection) - 1
+        raise_invalid unless index.between?(0, @connections.length - 1)
+        {:index => index}
       when /\A\z/
         {}
       else
-        raise ArgumentError, "invalid selection '#{selection}'"
+        raise_invalid
       end
     end
 
+    def raise_invalid
+      raise ArgumentError, 'selection must be an index from the list'
+    end
+
     def request_selection
       puts connection_list
       print 'Pick a server (or e to edit connections): '
@@ -30,14 +36,13 @@ module SshMenu
       uh_length = @connections.map {|conn| conn['user_host'].length}.max
       index_length = @connections.size.to_s.length
 
-      s = StringIO.new
-      @connections.each.with_index do |connection, index|
-        conn = connection['user_host']
-        desc = connection['description']
-        s << "%#{index_length}d) %-#{uh_length+3}s %s\n" % [ index+1, conn, desc]
-      end
-      s.string
+      @connections.each.with_index.each_with_object(StringIO.new) do |(connection, index), concat|
+        concat << "%#{index_length}d) %-#{uh_length+3}s %s\n" % [
+          index + 1,
+          connection['user_host'],
+          connection['description']
+        ]
+      end.string
     end
-
   end
 end

data/lib/sshmenu/version.rb

@@ -1,3 +1,3 @@
 module SshMenu
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/sshmenu.rb

@@ -1,7 +1,6 @@
-require 'sshmenu/options'
-require 'sshmenu/config'
-require 'sshmenu/actions'
-require 'sshmenu/selector'
+%w(options config selector actions).each do |req|
+  require "sshmenu/#{req}"
+end
 
 module SshMenu
   class SshMenu
@@ -10,21 +9,20 @@ module SshMenu
       config = Config.new
       actions = Actions.new(config)
 
-    selection = if options.empty?
-      selector = Selector.new(config.connections)
-      selector.select
-    else
-      options
-    end
+      selection = if options.empty?
+        Selector.new(config.connections).select
+      else
+        options
+      end
 
-    actions.edit if selection[:action] == :edit
-    actions.connect selection[:index] if selection[:index]
+      actions.edit if selection[:action] == :edit
+      actions.connect selection[:index] if selection[:index]
 
-  rescue ConfigException => e
-    puts e.message
-    Actions.ask_edit_with_default_editor
-  rescue Exception => e
-    ENV['SSHMENU_DEBUG'].eql?('true') ? raise(e) : puts(e.message)
+    rescue ConfigException => e
+      puts e.message
+      Actions.ask_edit_with_default_editor
+    rescue => e
+      puts(e.message) unless $DEBUG
+    end
   end
 end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sshmenu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -26,7 +26,7 @@ dependencies:
         version: '11.2'
 description: |
   This gem provides the executable 'sshmenu', which brings up
-  a list of configured ssh connection. From the list you can
+  a list of configured ssh connections. From the list you can
   directly connect to one of the ssh servers or edit the
   available ssh connections.
 email:
@@ -48,7 +48,7 @@ homepage: http://rubygems.org/gems/sshmenu
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: Type sshmenu -e to start editing you ssh connections
+post_install_message: Type sshmenu -e to start editing your ssh connections
 rdoc_options: []
 require_paths:
 - lib