ssh-manager 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4ef77e66250887d77ec7236a8f20eb845df7394
-  data.tar.gz: 637e713f4b840cd3017333f1b29da0d0da7fb9de
+  metadata.gz: 56dbc7d6e9248cc66a7a3840669ffc4cf0056555
+  data.tar.gz: 54cae9ac4705336ad6dbbb39628cb18003d101c2
 SHA512:
-  metadata.gz: ce685710f5976949842c3a0bd5b6d98105aa0460dc66658c1a92df11a37595c52eb8040601f89b9c10b9a87f9b69aaae677659ba1c1ad99f42c4ccfefcea02eb
-  data.tar.gz: b16ea06b519546be7bdf05aeaf5fdd270e63c52ca84dc87979255c1fec178b2f99f589146d588439cff8a4f4be045dab8894fc38a986e01e279651f73d34c534
+  metadata.gz: e15cc62eb68e761da4214faa7b1e5b4191aef724436386b045e593cfc7b8ed7fc4bf67481d599b2550aaeed28fb3849f1bc161c30e0c36fe763f444b67ea8ec2
+  data.tar.gz: 603a5b658f4db6f72a9725448f53f671fd09bfb875c9c7c19baeaee71db7d11e742700f979b28b3b5b0672302e5309a85d6be7c4180626aa3a8c033d7fb94089

data/lib/ssh/manager/ask.sh

@@ -0,0 +1,10 @@
+function ask {
+
+    local QUESTION="$1"
+    local DEFAULT_ANSWER="$2"
+
+    local PROMPT="$QUESTION"
+
+    read -e -p "${PROMPT}: " -i "$DEFAULT_ANSWER" USER_ANSWER
+    echo $USER_ANSWER
+}

data/lib/ssh/manager/cli.rb

@@ -12,44 +12,58 @@ module SSH
 
       def initialize(opts = {})
         @options = opts
+        @pretty_names = {:id => "ID", #TODO :connect_via
+                         :ip => "IP or hostname",
+                         :user => "Username",
+                         :hostname => "Alias",
+                         :port => "Port",
+                         :note => "Note",
+                         :options => "Options",
+                         :group => "Group",
+                         :connect_via => "Connect via (id)"}
+        @visible_fields = [:id, :ip, :group, :note]
+        @input_fields = [:ip, :hostname, :user, :port, :options, :note, :group, :connect_via]
+        @column_width = 15 #TODO make this dynamic or a yaml setting
       end
 
-      def check_term(ip, user, via)
-        if CONFIG['terminal'] == "xfce4-terminal" || CONFIG['terminal'] == "gnome-terminal"
-          if CONFIG['tabbed'] == 'true'
-            command = "--title=#{user}@#{ip} --tab --command="
-          else
-            command = "--title=#{user}@#{ip} --command="
-          end
-          #TODO: add title --title='connection name to identify '
-          #TODO: bug when no terminal is open => wants to open 2 terms
-          #TODO: dnslookup
-          if via.nil? or via.empty?
-            %x(#{CONFIG['terminal']} #{command}"ssh #{user}@#{ip}")
+      def connect_to(id)
+        id.each do |conn|
+          conn.to_i
+          ssh_command = ""
+          i = conn
+          begin
+            connection = DATABASE.get_connection_by_id(i)
+            ip = connection[:ip]
+            user = connection[:user]
+            user = ENV['USER'] if user == ""
+            options = connection[:options]
+            via = connection[:connect_via]
+            ssh_command = "ssh -A -t #{options} #{user}@#{ip} #{ssh_command}"
+            i = via
+            #TODO prevent endless via-loops
+          end while via
+          connection[:count] += 1
+          connection[:last_time] = Time.now
+          DATABASE.update_connection(connection)
+          if CONFIG['target'] == "self"
+            exec ssh_command
+          elsif CONFIG['terminal'] == "xfce4-terminal" || CONFIG['terminal'] == "gnome-terminal"
+            if CONFIG['tabbed'] == 'true'
+              command = "--title=#{user}@#{ip} --tab --command="
+            else
+              command = "--title=#{user}@#{ip} --command="
+            end
+            #TODO: add title --title='connection name to identify '
+            #TODO: bug when no terminal is open => wants to open 2 terms
+            #TODO: dnslookup
+            %x(#{CONFIG['terminal']} #{command}"#{ssh_command}")
+          elsif CONFIG['terminal'] == "xterm" || CONFIG['terminal'] == "urxvt"
+            %x(#{CONFIG['terminal']} -e "#{ssh_command}")
           else
-            %x(#{CONFIG['terminal']} #{command}"ssh -A -t #{via} ssh -A -t #{user}@#{ip}")
+            puts "We dont support #{CONFIG['terminal']} right now"
+            puts 'Check Github for further development or contributing'
           end
-        elsif CONFIG['terminal'] == "xterm" || CONFIG['terminal'] == "urxvt"
-          %x(#{CONFIG['terminal']} -e "ssh #{user}@#{ip}")
-        else
-          puts "We dont support #{CONFIG['terminal']} right now"
-          puts 'Check Github for further development or contributing'
         end
-      end
-
-      def connect_to(id)
-        via = DATABASE.get_connection_data[id.to_i-1][-1] =~ /@/
-        if via.nil?
-          @ip = DATABASE.get_connection_data[id.to_i-1][0]
-          @user = DATABASE.get_connection_data[id.to_i-1][1]
-          check_term(@ip, @user, via)
-        else
-          @ip = DATABASE.get_connection_data[id.to_i-1][0]
-          @user = DATABASE.get_connection_data[id.to_i-1][1]
-          via = DATABASE.get_connection_data[id.to_i-1][-1]
-          check_term(@ip, @user, via)
-        end
-        #TODO: check for options
         #TODO: if db[secure_login] = false => http://linuxcommando.blogspot.de/2008/10/how-to-disable-ssh-host-key-checking.html
       end
 
@@ -59,119 +73,125 @@ module SSH
         if new_version<old_version
           puts "There is a update available #{new_version} was released. -> sudo gem update ssh-manager"
         else
-        puts "Version: #{old_version} is up to date."
+          puts "Version: #{old_version} is up to date."
         end
       end
 
+      def show_info(id)
+        @input_fields << :count
+        @input_fields << :last_time
+        id.each do |conn|
+          connections = DATABASE.get_connection_by_id(conn.to_i)
+          puts "\n"
+          @input_fields.each do |field|
+            if field == :connect_via && connections[field] != nil
+              via_ip = DATABASE.get_connection_by_id(connections[field])[:ip]
+              printf "%s: %s  -|-  %s ", field, connections[field], via_ip
+            else
+              printf "%s: %s", field, connections[field]
+            end
+            puts "\n"
+          end
+        end
+      end
+
+      def transfer_key(id)
+        #TODO connect_via
+        #TODO options
+        connection = DATABASE.get_connection_by_id(id)
+        user = connection[:user]
+        user = ENV['USER'] if user == ""
+        %x(ssh-copy-id #{user}@#{connection[:ip]})
+      end
+
       def ping(id)
-        via = DATABASE.get_connection_data[id.to_i-1][-1] =~ /@/
-        @ip = DATABASE.get_connection_data[id.to_i-1][0]
-        if via.nil?
-          exec("ping #{@ip}")
+        connection = DATABASE.get_connection_by_id(id)
+        if connection[:connect_via]
+          connect_via = DATABASE.get_connection_by_id(connection[:connect_via])
+          ssh = "ssh #{connect_via[:user]}@#{connect_via[:ip]}"
+          exec("#{ssh} ping #{connection[:ip]} -c 3")
         else
-          via = DATABASE.get_connection_data[id.to_i-1][-1]
-          exec("ssh #{via} ping #{@ip}")
+          exec("ping #{connection[:ip]} -c 3")
         end
       end
 
-      def transfer_key(id)
-        @ip = DATABASE.get_connection_data[id.to_i-1][0]
-        @user = DATABASE.get_connection_data[id.to_i-1][1]
-        %x(ssh-copy-id #{@user}@#{@ip})
+      def test(type)
+        require 'byebug'
+        byebug
       end
 
       def transfer_file(filename, id='', dest_path="/home/#{user}/")
-        @ip = DATABASE.get_connection_data[id.to_i-1][0]
-        @user = DATABASE.get_connection_data[id.to_i-1][1]
-        %x(scp #{filename} #{@user}@#{@ip}:#{dest_path}) if File.file?(filename)
-        %x(scp -r #{filename} #{@user}@#{@ip}:#{dest_path}) if File.directory?(filename)
+        #TODO connect_via
+        #TODO options
+        connection = DATABASE.get_connection_by_id(id)
+        user = connection[:user]
+        user = ENV['USER'] if user == ""
+        %x(scp #{filename} #{user}@#{connection[:ip]}:#{dest_path}) if File.file?(filename)
+        %x(scp -r #{filename} #{@user}@#{connection[:ip]}:#{dest_path}) if File.directory?(filename)
       end
 
-      def add_connection(ip)
-        puts 'Username: '
-        user = $stdin.gets.chomp
-        user = 'root' if user == ''
-        puts 'Hostname: '
-        hostname = $stdin.gets.chomp
-        puts 'port: '
-        port = $stdin.gets.chomp
-        port = '22' if port == ''
-        puts 'Notes: '
-        note = $stdin.gets.chomp
-        puts 'Options: '
-        options = $stdin.gets.chomp
-        options = '' if options == ''
-        puts 'Group: '
-        group = $stdin.gets.chomp
-        puts 'Connect via(ip): '
-        connect_via_ip = $stdin.gets.chomp
-        puts 'With Username: '
-        connect_via_user = $stdin.gets.chomp
-        connect_via = ""
-        connect_via= "#{connect_via_user}@#{connect_via_ip}" unless connect_via_user.empty?
-        count = 0
-        created_at = Time.now.to_s
-        last_time = Time.now.to_s
-        DATABASE.add_new_connection(ip, user, hostname, port, note, connect_via, created_at, options, count, group, last_time)
+      def add_connection
+        connection = {:user => ENV['USER'],
+                      :port => "22"}
+        @input_fields.each do |key|
+          #TODO make this a method
+          connection[key] = %x{source #{File.dirname(__FILE__)}/ask.sh; ask '#{@pretty_names[key]}' '#{connection[key]}'}.chomp
+        end
+        connection[:count] = 0
+        connection[:created_at] = Time.now.to_s
+        connection[:last_time] = Time.now.to_s
+        connection[:connect_via] = nil if connection[:connect_via] == ""
+        DATABASE.add_new_connection(connection)
+        #TODO catch SQLite3::ConstraintException
       end
 
       def delete(id)
-        id = id.to_i - 1
-        DATABASE.delete_connection(DATABASE.get_connection_data[id][0])
+        id.each do |conn|
+          conn.to_i
+          DATABASE.delete_connection(conn)
+        end
       end
 
       def list_all
-        cnt = 0
-        connections = Hash[DATABASE.get_connection_data.collect { |x| [cnt+=1, x]}]
-        puts 'ID IP             USERNAME       NOTES          GROUP'
-        connections.each do |x|
-          print "#{x[0]}: "
-          x[1].each do |a|
-            printf '%-15s', a
-          end
+        connections = DATABASE.get_connection_data
+        @visible_fields.each { |f| printf "%-#{@column_width}s", @pretty_names[f] }
+        puts "\n"
+        connections.each do |c|
+          @visible_fields.each { |f| printf "%-#{@column_width}s", c[f] }
           puts "\n"
         end
       end
 
       def update(id)
-        puts 'Entries wont change of left out blank.'
-        puts 'Username: '
-        user =$stdin.gets.chomp
-        user = DATABASE.get_connection_data[id.to_i][1] if user == ''
-        puts 'Hostname: '
-        hostname = $stdin.gets.chomp
-        hostname = DATABASE.get_connection_data[id.to_i][2] if hostname == ''
-        puts 'port: '
-        port = $stdin.gets.chomp
-        port = DATABASE.get_connection_data[id.to_i][3] if port == ''
-        puts 'Notes: '
-        note = $stdin.gets.chomp
-        note = DATABASE.get_connection_data[id.to_i][4] if note == ''
-        DATABASE.update_connection(DATABASE.get_connection_data[id.to_i][0], user, hostname, port, note)
+        connection = DATABASE.get_connection_by_id(id)
+        @input_fields.each do |key|
+          #TODO make this a method
+          connection[key] = %x{source #{File.dirname(__FILE__)}/ask.sh; ask '#{@pretty_names[key]}' '#{connection[key]}'}.chomp
+        end
+        connection[:connect_via] = nil if connection[:connect_via] == ""
+        DATABASE.update_connection(connection)
+        #TODO catch SQLite3::ConstraintException
       end
 
       def search_for(term)
-        puts 'IP                  USERNAME            HOSTNAME            PORT                NOTES               GROUP'
+        puts "All results for searchterm: #{term}"
+        @visible_fields.each { |f| printf "%-#{@column_width}s", @pretty_names[f] }
+        print "\n"
         DATABASE.search_for(term).each do |x|
           x.all.each do |cons|
-            cons.values.each do |each_con|
-              printf '%-20s', each_con
-            end
+            @visible_fields.each { |f| printf "%-#{@column_width}s", cons[f] }
             puts "\n"
           end
         end
-        puts "All results for searchterm: #{term}"
       end
 
       def multiple_connection(term)
         DATABASE.search_for(term).each do |x|
           x.all.each do |dataset|
-            check_term(dataset[:ip], dataset[:user], dataset[:connect_via])
-            #TODO: Add terminalposition
+            self.connect_to(dataset[:id])
           end
         end
       end
-
     end
   end
 end

data/lib/ssh/manager/client.rb

@@ -18,15 +18,24 @@ module SSH
 
       def execute!
         cli = SSH::Manager::Cli
+        # TODO id.to_i is not good enough. we want to support hostnames too
+        # Checking and casting in the methods itself could solve the problem
+        # futhermore this could reside in a separate method
         if @options[:add]
           puts 'Adding ..'
-          cli.new(@options).add_connection(@options[:add])
+          cli.new(@options).add_connection
         elsif @options[:connect]
           puts 'Connecting ..'
           cli.new(@options).connect_to(@options[:connect])
+        elsif @options[:info]
+          puts 'Printing info ..'
+          cli.new(@options).show_info(@options[:info])
         elsif @options[:transfer_file]
           puts 'Transfering file..'
-          cli.new(@options).transfer_file(@options[:transfer_file], @argv[2], @argv[3])
+          cli.new(@options).transfer_file(@options[:transfer_file].to_i, @argv[2], @argv[3])
+        elsif @options[:ping]
+          puts 'Pinging..'
+          cli.new(@options).ping(@options[:ping].to_i)
         elsif @options[:delete]
           puts 'Deleting ..'
           cli.new(@options).delete(@options[:delete])
@@ -38,16 +47,13 @@ module SSH
           cli.new(@options).update_available
         elsif @options[:update]
           puts 'Updating ..'
-          cli.new(@options).update(@options[:update])
+          cli.new(@options).update(@options[:update].to_i)
         elsif @options[:multi]
           puts 'Connecting to multiple ips..'
           cli.new(@options).multiple_connection(@options[:multi])
         elsif @options[:transfer_key]
           puts 'Transfering key..'
-          cli.new(@options).transfer_key(@options[:transfer_key])
-        elsif @options[:ping]
-          puts 'Ping Pong..'
-          cli.new(@options).ping(@options[:ping])
+          cli.new(@options).transfer_key(@options[:transfer_key].to_i)
         elsif @options[:search]
           puts 'Searching ..'
           cli.new(@options).search_for(@options[:search])
@@ -65,27 +71,31 @@ module SSH
         @optparse = OptionParser.new do |opts|
           opts.banner = "Usage: sshm [options] ..."
           @options[:add] = false
-          opts.on( '-a', '--add ip', 'Add ip to your Connection list' ) do |opt|
-            @options[:add] = opt
+          opts.on( '-a', '--add', 'add a new connection' ) do
+            @options[:add] = true
           end
           @options[:transfer_key] = false
           opts.on( '-t', '--transferkey id', 'transfer key to <id>' ) do |opt|
             @options[:transfer_key] = opt
           end
-          @options[:ping] = false
-          opts.on( '-p', '--ping connection id', 'ping connection/)' ) do |opt|
-            @options[:ping] = opt
-          end
           @options[:transfer_file] = false
           opts.on( '-r', '--transferfile filename', 'file or dir / connection_ID / dest_path(default is /home/user/)' ) do |opt|
             @options[:transfer_file] = opt
           end
           @options[:connect] = false
-          opts.on( '-c', '--connect id', 'connect to <id>' ) do |opt|
+          opts.on( '-c', '--connect x y z', Array, 'connect to <ids>' ) do |opt|
             @options[:connect] = opt
           end
+          @options[:info] = false
+          opts.on( '-i', '--info id1 id2 id3',Array, 'info about to <id>' ) do |opt|
+            @options[:info] = opt
+          end
+          @options[:ping] = false
+          opts.on( '-p', '--ping id', 'test connection of <id>' ) do |opt|
+            @options[:ping] = opt
+          end
           @options[:delete] = false
-          opts.on( '-d', '--delete id', 'delete connection <id>' ) do |opt|
+          opts.on( '-d', '--delete id1 id2 id3',Array, 'delete connection <ids>' ) do |opt|
             @options[:delete] = opt
           end
           @options[:update] = false
@@ -108,11 +118,11 @@ module SSH
           opts.on( '-g', '--upgrade', 'checks for upgrade' ) do
             @options[:upgrade] = true
           end
-          opts.on( '-h', '--help', 'Display this screen' ) do
+          opts.on( '-h', '--help', 'display this screen' ) do
             puts opts
             exit
           end
-          opts.on( '-v', '--version', 'Print programs version' ) do
+          opts.on( '-v', '--version', 'print programs version' ) do
             puts SSH::Manager::VERSION
             exit
           end

data/lib/ssh/manager/db.rb

@@ -5,41 +5,65 @@ module SSH
   module Manager
     class Database
 
-      FileUtils.mkdir_p("#{File.join(ENV['HOME'])}/.config/sshm/") unless Dir.exists?("#{ENV['HOME']}/.config/sshm")
-      FileUtils.cp ("#{File.dirname(__FILE__)}/../../../config/sshm.db"), ("#{File.join(Dir.home)}" + '/.config/sshm/') unless File.exists?(("#{File.join(Dir.home)}" + '/.config/sshm/sshm.db'))
+      @config_dir = "#{ENV['HOME']}/.config/sshm"
+      FileUtils.mkdir_p(@config_dir) unless Dir.exists?(@config_dir)
 
-      @path = "#{File.join(ENV['HOME'])}/.config/sshm"
-      DATABASE = Sequel.connect("sqlite://#{@path}/sshm.db")
+      @database_file = "#{@config_dir}/sshm.sqlite3"
+      unless File.exists?(@database_file)
+        Sequel.sqlite(@database_file).run <<-NEW_DB
+CREATE TABLE connection (
+   "id"           INTEGER PRIMARY KEY AUTOINCREMENT,
+   "ip"           TEXT,
+   "user"         TEXT,
+   "hostname"     TEXT,
+   "port"         INTEGER,
+   "note"         TEXT,
+   "created_at"   TEXT,
+   "options"      TEXT,
+   "group"        TEXT,
+   "count"        INTEGER,
+   "last_time"    TEXT,
+   "secure_check" INTEGER,
+   "connect_via"  INTEGER NULL,
+   FOREIGN KEY("connect_via") REFERENCES connection("id")
+);
+
+INSERT INTO connection ("ip", "hostname") VALUES ("127.0.0.1", "localhost");
+NEW_DB
+        #TODO make group a n:m relation to extra table
+      end
+      DATABASE = Sequel.sqlite(@database_file)
 
       attr_accessor :connections
 
       def initialize
-        @connections= DATABASE.from(:connection)
+        @connections = DATABASE[:connection]
+      end
+
+      def get_connection_by_id(id)
+        @connections[:id => id].to_hash
       end
 
       def get_connection_data
-        @connections.map([:ip, :user, :note, :group, :connect_via])
+        @connections.all
       end
 
-      def add_new_connection(ip, user='root', hostname='', port=22, note='', connect_via='', created_at, option, count, group, last_time)
-        @connections.insert(:ip => ip, :user => user, :hostname => hostname, :port => port, :note => note, :connect_via => connect_via, :created_at => created_at, :options => option, :group => group, :count => count, :last_time => last_time)
+      def add_new_connection(connection)
+        @connections.insert(connection)
       end
 
-      def delete_connection(ip)
-        # add && :user => user to ensure deletion
-        @connections.where(:ip => ip).delete
+      def delete_connection(id)
+        @connections.where(:id => id).delete
       end
 
-      def update_connection(ip, user, hostname, port, note)
-        @connections.where(:ip => ip).update(:user => user, :hostname => hostname, :port => port, :note => note)
+      def update_connection(connection)
+        @connections.where(:id => connection[:id]).update(connection)
       end
 
       def search_for(term)
         # check online: search for 'contains' not for complete matching
         return  @connections.where(:ip => term),  @connections.where(:user => term), @connections.where(:hostname => term), @connections.where(:port => term), @connections.where(:note => term), @connections.where(:group => term), @connections.where(:options => term)
       end
-
-
     end
   end
 end

data/lib/ssh/manager/version.rb

@@ -1,5 +1,5 @@
 module SSH
   module Manager
-    VERSION = "1.0.7"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssh-manager
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Joshua Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,9 +88,9 @@ files:
 - Rakefile
 - bin/sshm
 - config/settings.yml
-- config/sshm.db
 - doc/user_spec
 - lib/ssh/manager.rb
+- lib/ssh/manager/ask.sh
 - lib/ssh/manager/cli.rb
 - lib/ssh/manager/client.rb
 - lib/ssh/manager/db.rb