ssh-manager 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 103b68fe6312ce929a945d39d18a5ccb420b26c4
-  data.tar.gz: 9344a6da7e8c824744f5f6e39c50144e20a84baf
+  metadata.gz: e4c65127691cc262a53e1b6be85f842ba415e349
+  data.tar.gz: 7058ae0879a2d78f69f8cbaa7dfc53317059e111
 SHA512:
-  metadata.gz: 7dcc80434c9f0ae484247f78c4d514b996c13f97e8d5607db5ecbe4fdd6c07bdd546dbcd05d7ecc5d6a1b6cca7a7b52dc52ede41336011e47f3feaa8fbc58f37
-  data.tar.gz: b7b158e35c70408d92cc79d58bd166abbafd7baaa96d6957de8f0f047a1e903aea1e0e5505f3a0503b17b0deab6f506c16d6265a88d3eb1d4f7fe471ef7ce744
+  metadata.gz: 00fc8b45dab4c90ec36791c0491f6c036fe6ec43b67f51f61053e6ad492905f3ff3c60502a3cad06d7f3b57aa76f27cd91b00391ac2d30e78037ff7c3124b88e
+  data.tar.gz: 8c423a6806e02655fb5696b35842a6377d228933ab4393eece72f96255154072db8679086bca25e481c87c30108db869680facdc9a5a2d9c50d8eb39565928da

data/config/settings.yml

@@ -1,2 +1,3 @@
-terminal : "xterm"
+terminal : "xfce4-terminal"
 deletion_interval : "never"
+tabbed: 'false'

data/lib/ssh/manager/cli.rb

@@ -2,6 +2,7 @@ require_relative 'db'
 require 'yaml'
 FileUtils.cp ("#{File.dirname(__FILE__)}/../../../config/settings.yml"), ("#{File.join(Dir.home)}" + '/.config/sshm/') unless File.exists?(("#{File.join(Dir.home)}" + '/.config/sshm/settings.yml'))
 CONFIG = YAML.load_file("#{File.join(ENV['HOME'])}/.config/sshm/settings.yml")
+require 'debugger'
 
 module SSH
   module Manager
@@ -11,34 +12,52 @@ module SSH
         @options = opts
       end
 
-      def connect_to(id)
-        ip = SSH::Manager::Database.new.get_connection_data[id.to_i-1][0]
-        user = SSH::Manager::Database.new.get_connection_data[id.to_i-1][1]
+      def check_term(ip, user)
         if CONFIG['terminal'] == "xfce4-terminal" || CONFIG['terminal'] == "gnome-terminal"
-          %x(#{CONFIG['terminal']} --command="ssh #{user}@#{ip}")
-        elsif CONFIG['terminal'] == "xterm"
+          if CONFIG['tabbed'] == 'true'
+            command = '--tab --command='
+          else
+            command = '--command='
+          end
+          #TODO: add title --title='connection name to identify '
+          #TODO: bug when no terminal is open => wants to open 2 terms
+          %x(#{CONFIG['terminal']} #{command}"ssh #{user}@#{ip}")
+        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"
+          puts 'Check Github for further development or contributing'
         end
+      end
 
-
-
+      def connect_to(id)
+        @ip = SSH::Manager::Database.new.get_connection_data[id.to_i-1][0]
+        @user = SSH::Manager::Database.new.get_connection_data[id.to_i-1][1]
+        check_term(@ip, @user)
+        #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
 
       def add_connection(ip)
-        puts "Username: "
-        user =$stdin.gets.chomp
+        puts 'Username: '
+        user = $stdin.gets.chomp
         user = 'root' if user == ''
-        puts "Hostname: "
+        puts 'Hostname: '
         hostname = $stdin.gets.chomp
-        puts "port: "
+        puts 'port: '
         port = $stdin.gets.chomp
-        port = "22" if port == ''
-        puts "Notes: "
+        port = '22' if port == ''
+        puts 'Notes: '
         note = $stdin.gets.chomp
-        SSH::Manager::Database.new.add_new_connection(ip, user, hostname, port, note)
+        puts 'Options: '
+        options = $stdin.gets.chomp
+        options = '' if options == ''
+        puts 'Group: '
+        group = $stdin.gets.chomp
+        count = 0
+        created_at = Time.now.to_s
+        last_time = Time.now.to_s
+        SSH::Manager::Database.new.add_new_connection(ip, user, hostname, port, note, created_at, options, count, group, last_time)
       end
 
       def delete(id)
@@ -48,43 +67,56 @@ module SSH
 
       def list_all
         cnt = 0
-        # TODO: add indentation functionality with stringlenght etc..
         connections = Hash[SSH::Manager::Database.new.get_connection_data.collect { |x| [cnt+=1, x]}]
-        puts "ID IP                  USERNAME            HOSTNAME            PORT                NOTES"
+        puts 'ID IP                  USERNAME            HOSTNAME            PORT                NOTES               GROUP'
         connections.each do |x|
           print "#{x[0]}: "
           x[1].each do |a|
-            printf "%-20s", a
+            printf '%-20s', a
           end
           puts "\n"
         end
-
       end
 
       def update(id)
-        puts "Username: "
+        puts 'Entries wont change of left out blank.'
+        puts 'Username: '
         user =$stdin.gets.chomp
         user = SSH::Manager::Database.new.get_connection_data[id.to_i][1] if user == ''
-        puts "Hostname: "
+        puts 'Hostname: '
         hostname = $stdin.gets.chomp
         hostname = SSH::Manager::Database.new.get_connection_data[id.to_i][2] if hostname == ''
-        puts "port: "
+        puts 'port: '
         port = $stdin.gets.chomp
         port = SSH::Manager::Database.new.get_connection_data[id.to_i][3] if port == ''
-        puts "Notes: "
+        puts 'Notes: '
         note = $stdin.gets.chomp
         note = SSH::Manager::Database.new.get_connection_data[id.to_i][4] if note == ''
         SSH::Manager::Database.new.update_connection(SSH::Manager::Database.new.get_connection_data[id.to_i][0], user, hostname, port, note)
       end
 
       def search_for(term)
+        puts 'IP                  USERNAME            HOSTNAME            PORT                NOTES               GROUP'
         SSH::Manager::Database.new.search_for(term).each do |x|
-          puts x.all
+          x.all.each do |cons|
+            cons.values.each do |each_con|
+              printf '%-20s', each_con
+            end
+            puts "\n"
+          end
         end
         puts "All results for searchterm: #{term}"
       end
 
+      def multiple_connection(term)
+        SSH::Manager::Database.new.search_for(term).each do |x|
+          x.all.each do |dataset|
+            check_term(dataset[:ip], dataset[:user])
+            #TODO: Add terminalposition
+          end
+        end
+      end
+
     end
   end
 end
-

data/lib/ssh/manager/client.rb

@@ -2,6 +2,7 @@
 require 'optparse'
 require_relative 'db'
 require_relative 'client'
+require_relative 'version'
 
 module SSH
   module Manager
@@ -32,9 +33,15 @@ module SSH
         elsif @options[:update]
           puts 'Updating ..'
           cli.new(@options).update(@options[:update])
+        elsif @options[:multi]
+          puts 'Connecting to multiple ips'
+          cli.new(@options).multiple_connection(@options[:multi])
         elsif @options[:search]
           puts 'Searching ..'
           cli.new(@options).search_for(@options[:search])
+        # elsif @options[:settings]
+        #   puts 'Settings'
+        #   cli.new(@options).settings(@options[:settings])
         else
           cli.new(@argv.first).connect_to(@argv.first) if @argv != []
           puts @optparse if @argv ==[]
@@ -65,6 +72,10 @@ module SSH
           opts.on( '-s', '--search string', 'search connection for given criteria' ) do |opt|
             @options[:search] = opt
           end
+          @options[:multi] = false
+          opts.on( '-m', '--multi string', 'connect to multiple ips with given criteria' ) do |opt|
+            @options[:multi] = opt
+          end
           @options[:list] = false
           opts.on( '-l', '--list', 'list all connections' ) do
             @options[:list] = true

data/lib/ssh/manager/db.rb

@@ -5,8 +5,8 @@ module SSH
   module Manager
     class Database
 
-      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'))
       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'))
 
       @path = "#{File.join(ENV['HOME'])}/.config/sshm"
       DATABASE = Sequel.connect("sqlite://#{@path}/sshm.db")
@@ -18,12 +18,11 @@ module SSH
       end
 
       def get_connection_data
-        @connections.map([:ip, :user, :hostname, :port, :note])
+        @connections.map([:ip, :user, :hostname, :port, :note, :group])
       end
 
-      def add_new_connection(ip, user='root', hostname='', port=22, note='')
-        # default params are currently useless FIXME
-        @connections.insert(:ip => ip, :user => user, :hostname => hostname, :port => port, :note => note)
+      def add_new_connection(ip, user='root', hostname='', port=22, note='', created_at, option, count, group, last_time)
+        @connections.insert(:ip => ip, :user => user, :hostname => hostname, :port => port, :note => note, :created_at => created_at, :options => option, :group => group, :count => count, :last_time => last_time)
       end
 
       def delete_connection(ip)
@@ -37,9 +36,10 @@ module SSH
 
       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)
+        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 = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/ssh-manager.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_runtime_dependency 'sequel', '=4.13.0'
   spec.add_runtime_dependency 'sqlite3', '=1.3.9'
+  #spec.add_runtime_dependency 'ruby-devel', '=1.3.9'
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssh-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Joshua Schmid, Juraj Hura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler