ssh-manager 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59aa22da8f515be9a7fe111618dd3ea02d7e790a
-  data.tar.gz: e459ee67d54e5a0f2a38ebc429a653eedc3b2397
+  metadata.gz: 42ad60fcccaaa39c9aa677635f50e8055d3f3114
+  data.tar.gz: fd87b518c5b286678ed6e8f9e1ee552c33a5c212
 SHA512:
-  metadata.gz: 3d6016baa8e8264fe02a57c77b301f643293bb27b352093b998a91d9cffd83f38f78b009def347a57d6787b04b8799e9db383f922301ed4a92a6e7d4ff1fdb36
-  data.tar.gz: 41d3e995cf4b7e39a20d6fb98e0af35f81d4e4a6e0c1fe96eddf24243014a6219b4ec2be17657ff7993f43992e6e86522275a3083eab73cbe2caa77b73ce977f
+  metadata.gz: ed798fd1f65a2031fa3bb913afec5933c1a9e022568546bbe758386bf8d5a590323e5e020028a54ac20d75ba44c405fb90e47c4f67c1a07a23847b944cae80f6
+  data.tar.gz: f787cd59461fb2e13b259b6f4d7994871c04885c8048a41934c3135269d84a738049abee1a543afaf8efe7aff4fca83f7e054ef9f6a4d697a3d675b6b6f8613e

data/.gitignore

@@ -16,3 +16,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/idea
+./idea
+/idea/*
+idea/*

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ssh-manager.gemspec
+gem 'colorize'
 gem 'rspec'
 gem 'sequel'
 gem 'sqlite3'

data/lib/ssh/manager/cli.rb

@@ -1,4 +1,6 @@
 require_relative 'db'
+require 'colorize'
+require 'readline'
 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")
@@ -106,14 +108,17 @@ module SSH
       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]})
+        id.each do |con|
+          connection = DATABASE.get_connection_by_id(con)
+          user = connection[:user]
+          user = ENV['USER'] if user == ""
+          %x(ssh-copy-id #{user}@#{connection[:ip]})
+        end
       end
 
       def ping(id)
-        connection = DATABASE.get_connection_by_id(id)
+        id.each do |con|
+        connection = DATABASE.get_connection_by_id(con)
         if connection[:connect_via]
           connect_via = DATABASE.get_connection_by_id(connection[:connect_via])
           ssh = "ssh #{connect_via[:user]}@#{connect_via[:ip]}"
@@ -121,8 +126,58 @@ module SSH
         else
           exec("ping #{connection[:ip]} -c 3")
         end
+        end
       end
+
+      def execute_command(id)
+        # id.first should be the command
+        cmd = id.shift
+        id.each do |con|
+          connection = DATABASE.get_connection_by_id(con)
+          if connection[:connect_via]
+            connect_via = DATABASE.get_connection_by_id(connection[:connect_via])
+            ssh = "ssh #{connect_via[:user]}@#{connect_via[:ip]}"
+            system("#{ssh} #{cmd}")
+          else
+            ssh = "ssh #{connection[:user]}@#{connection[:ip]}"
+            system("#{ssh} #{cmd}")
+          end
+        end
+      end
+
       def test(id)
+        require 'byebug'
+        byebug
+      end
+
+      def settings
+        CONFIG.keys.each do |key|
+          puts "#{key}=#{CONFIG[key]}"
+        end
+        possible_options ={terminal: %w(xfce4-terminal gnome-terminal urxvt),
+                           deletion_interval: %w(never), tabbed: %w(true false),
+                          self: %w(true false)}
+
+        # change tabbed to mode %w(tabbed whatelse)
+        print "Want to change? (y/n)"
+        answer = STDIN.gets.chomp
+        comp = proc { |s| possible_options.values.flatten.grep(/^#{Regexp.escape(s)}/) }
+        Readline.completion_append_character = " "
+        Readline.completion_proc = comp
+        if answer == "y"
+          CONFIG.keys.each do |key|
+            puts "#{key}:".colorize(:green)
+            puts "possible options are: #{possible_options[key.to_sym]}"
+            puts "leave blank to not make any changes (TAB-Completion avalaible)"
+            input = Readline.readline('> ', true)
+            CONFIG[key] = input if input != ""
+          end
+          File.open(("#{File.join(ENV['HOME'])}/.config/sshm/settings.yml"),'w') do |h|
+               h.write CONFIG.to_yaml
+          end
+        else
+          exit
+        end
       end
 
       def transfer_file(filename, id='', dest_path="/home/#{user}/")
@@ -168,14 +223,16 @@ module SSH
       end
 
       def update(id)
-        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
+        id.each do |con|
+          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
-        connection[:connect_via] = nil if connection[:connect_via] == ""
-        DATABASE.update_connection(connection)
-        #TODO catch SQLite3::ConstraintException
       end
 
       def search_for(term)
@@ -191,10 +248,42 @@ module SSH
       end
 
       def multiple_connection(term)
+        @cons = []
         DATABASE.search_for(term).each do |x|
           x.all.each do |dataset|
-            self.connect_to(dataset[:id])
+            @cons.push(dataset)
           end
+        end
+            # FAIL, first push everything in cons, then do the rest !
+            puts "what yer gonna do?"
+            options = {execute_command: 'execute_command', connect_to: 'connect', ping: 'ping', info: 'info', delete: 'delete'}
+            comp = proc { |s| options.values.grep(/^#{Regexp.escape(s)}/) }
+            #Readline.completion_append_character = " "
+            Readline.completion_proc = comp
+            puts options.values.to_s
+            input= Readline.readline('> ', true)           
+            ids = @cons.map {|x| x[:id].to_s}
+            input = input.chomp.gsub(/\s+\Z/, "")
+            case input
+            when 'execute_command'
+              # which commands
+              self.execute_command(ids)
+              exit
+            when 'connect'
+              self.connect_to(ids)
+              exit
+            when 'ping'
+              # exits after first ping
+              self.ping(ids)
+              exit
+            when 'info'
+              self.show_info(ids)
+              exit
+            when 'delete'
+              self.delete(ids)
+              exit
+            else
+              puts "That i dont know :/"
         end
       end
     end

data/lib/ssh/manager/client.rb

@@ -33,6 +33,9 @@ module SSH
         elsif @options[:info]
           puts 'Printing info ..'
           cli.new(@options).show_info(@options[:info])
+        elsif @options[:execute]
+          puts 'Executing command..'
+          cli.new(@options).execute_command(@options[:execute])
         elsif @options[:transfer_file]
           puts 'Transfering file..'
           cli.new(@options).transfer_file(@options[:transfer_file].to_i, @argv[2], @argv[3])
@@ -50,22 +53,22 @@ module SSH
           cli.new(@options).update_available
         elsif @options[:update]
           puts 'Updating ..'
-          cli.new(@options).update(@options[:update].to_i)
+          cli.new(@options).update(@options[:update])
         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].to_i)
-        elsif @options[:codeing]
+          cli.new(@options).transfer_key(@options[:transfer_key])
+        elsif @options[:encoding]
           puts 'coding key..'
-          cli.new(@options).test(@options[:coding].to_i)
+          cli.new(@options).test(@options[:encoding].to_i)
+        elsif @options[:settings]
+          puts 'Settings'
+          cli.new(@options).settings
         elsif @options[:search]
           puts 'Searching ..'
           cli.new(@options).search_for(@options[:search])
-        # elsif @options[:settings]
-        #   puts 'Settings'
-        #   cli.new(@options).settings(@options[:settings])
         else
           if @argv.count == 1
             cli.new(@options).connect_to(@argv.first.split(',')) if @argv != []
@@ -78,6 +81,7 @@ module SSH
       end
 
       def extract_options
+        begin
         @optparse = OptionParser.new do |opts|
           opts.banner = "Usage: sshm [options] ..."
           @options[:add] = false
@@ -85,25 +89,30 @@ module SSH
             @options[:add] = true
           end
           @options[:transfer_key] = false
-          opts.on( '-t', '--transferkey id', 'transfer key to <id>' ) do |opt|
+          opts.on( '-t', '--transferkey id,id,id', Array, 'transfer key to <id>' ) do |opt|
             @options[:transfer_key] = 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[:encoding] = false
           code_list = (CODE_ALIASES.keys + CODES).join(',')
           opts.on("--code CODE", CODES, CODE_ALIASES, "Select encoding"," (#{code_list})") do |encoding|
-          options.encoding = encoding
+            @options[:encoding] = encoding
           end
           @options[:connect] = false
-          opts.on( '-c', '--connect x y z', Array, 'connect to <ids>' ) do |opt|
+          opts.on( '-c', '--connect id1, id2, id3', 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[:execute] = false
+          opts.on( '-x', '--exec id1 id2 id3',Array, 'exec command on <id>' ) do |opt|
+            @options[:execute] = opt
+          end
           @options[:ping] = false
           opts.on( '-p', '--ping id', 'test connection of <id>' ) do |opt|
             @options[:ping] = opt
@@ -113,7 +122,7 @@ module SSH
             @options[:delete] = opt
           end
           @options[:update] = false
-          opts.on( '-u', '--update id', 'update connection <id>' ) do |opt|
+          opts.on( '-u', '--update id,id,id',Array ,'update connection <id>' ) do |opt|
             @options[:update] = opt
           end
           @options[:search] = false
@@ -121,7 +130,7 @@ module SSH
             @options[:search] = opt
           end
           @options[:multi] = false
-          opts.on( '-m', '--multi string', 'connect to multiple ips with given criteria' ) do |opt|
+          opts.on( '-m', '--multi searchterm', 'connect to multiple ips with given criteria' ) do |opt|
             @options[:multi] = opt
           end
           @options[:list] = false
@@ -132,6 +141,10 @@ module SSH
           opts.on( '-g', '--upgrade', 'checks for upgrade' ) do
             @options[:upgrade] = true
           end
+          @options[:settings] = false
+          opts.on( '--settings', 'update settings' ) do
+            @options[:settings] = true
+          end
           opts.on( '-h', '--help', 'display this screen' ) do
             puts opts
             exit
@@ -142,6 +155,9 @@ module SSH
           end
         end
         @optparse.parse(@argv)
+        rescue => e
+          catch "That didnt work: #{e.to_s}"
+        end
       end
     end
   end

data/lib/ssh/manager/version.rb

@@ -1,5 +1,5 @@
 module SSH
   module Manager
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssh-manager
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Joshua Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,12 +75,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".idea/encodings.xml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/scopes/scope_settings.xml"
-- ".idea/ssh-manager.iml"
-- ".idea/vcs.xml"
 - ".rspec"
 - Gemfile
 - LICENSE