ssh_bookmarker 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjQ4NDBkODRmNGE1Y2Y2NTdiZDc1NDIzZTM2NjUzYjQwNTY3NzQzMA==
+  data.tar.gz: !binary |-
+    MTU5Y2ZiNGU4ZDhlOTY3NzczZGVjY2JkMWE1OWNiN2U1NjY2ZmIzZQ==
+SHA512:
+  metadata.gz: !binary |-
+    ODBiY2FkNmU5N2M3YmZlYjYxZDRmYTcyMDJmZjc1MGIwNzRiZGNiMDQxZDhl
+    NWE3ZjU1ZmRkZGQ2NjAwNjI1NTllNWZiMzJjNzRhYTExNjIzMTQ3MDdlM2Qy
+    NjQ1Nzc5MDE2YWFlZmU4ZDE4NmY5MTU5NzRkOWE2NjM2MDFjN2U=
+  data.tar.gz: !binary |-
+    MjZiNmU3OTIzZWY2M2Q2NTRiYWVmYmUwMGFkZDE0MmQ2ZTgxZmEzNDcxMjE1
+    NzY4N2NjZDliYjNjZGZkZWQ4NTY3MmFmYmY5Zjk3OGMzODExNTk2NTFmNWRh
+    OGJkODM5Y2EzNmQzNzg0Zjg5ZDNhNWRlZjA3OWJmNWUzNWU5M2M=

data/lib/ssh_bookmarker.rb

@@ -34,13 +34,13 @@ module SSHBookmarker
           logger.info("Skipping missing SSH config file #{path}")
           next
         end
-        parse_ssh_config(path) do |hostname, url_scheme|
+        parse_ssh_config(path) do |hostnames, url_scheme|
           if @protocol_override
-            (@protocol_override.call(hostname, url_scheme) || [url_scheme]).each do |scheme|
-              make_webloc(hostname, nil, scheme)
+            (@protocol_override.call(hostnames, url_scheme) || [url_scheme]).each do |scheme|
+              hostnames.each { |hostname| make_webloc(hostname, nil, scheme) }
             end
           else
-            make_webloc(hostname, nil, url_scheme)
+            hostnames.each { |hostname| make_webloc(hostname, nil, url_scheme) }
           end
         end
       end
@@ -67,7 +67,7 @@ module SSHBookmarker
             port = ported_host_match[2]
             yield(host, port)
           else
-            yield(hostname) unless hostname.match(/ /) || hostname.match(/^[\[]/)  || hostname.match(/^[0-9\.]+$/) || hostname.match(/^[a-f0-9\:]+(%.*)?$/)
+            yield([hostname]) unless hostname.match(/ /) || hostname.match(/^[\[]/)  || hostname.match(/^[0-9\.]+$/) || hostname.match(/^[a-f0-9\:]+(%.*)?$/)
           end
         end
       end
@@ -82,10 +82,8 @@ module SSHBookmarker
           url_schemes = extract_url_scheme($2)
           hosts = host_spec.split(/\s+/)
           logger.debug("Got hosts #{hosts.inspect}")
-          hosts.each do |host|
-            url_schemes.each do |url_scheme|
-              yield(host, nil, url_scheme) unless host.match /\*/
-            end
+          url_schemes.each do |url_scheme|
+            yield(hosts, nil, url_scheme) unless hosts.any?{ |hn| hn.match(/\*/) }
           end
         end
       end

data/lib/ssh_bookmarker/cli.rb

@@ -47,6 +47,7 @@ USAGE
         opts.on('-M PATTERN', '--prevent-mosh=PATTERN', 'Prevent emitting a mosh bookmark for host names matching PATTERN') do |pattern|
           @mosh_negative_domain_patterns << to_match_expr(pattern)
         end
+
         opts.on('-v', '--verbose', 'More debug chunder') do
           @debug_level -= 1
         end
@@ -76,9 +77,9 @@ USAGE
       parser.logger = logger
 
       if @mosh_positive_domain_patterns.length > 0
-        parser.protocol_override = proc do |hostname, url_scheme|
-          if @mosh_positive_domain_patterns.find {|pattern| hostname.match(pattern)} &&
-              !@mosh_negative_domain_patterns.find {|pattern| hostname.match(pattern)}
+        parser.protocol_override = proc do |hostnames, url_scheme|
+          if @mosh_positive_domain_patterns.find {|pattern| hostnames.any?{ |hn| hn.match(pattern) }} &&
+              !@mosh_negative_domain_patterns.find {|pattern| hostnames.any?{ |hn| hn.match(pattern) }}
             ['mosh']
           end
         end

data/lib/ssh_bookmarker/version.rb

@@ -1,3 +1,3 @@
 module SSHBookmarker
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ssh_bookmarker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Andreas Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -66,27 +61,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem installs a script that lets you generate SSH bookmarks from the
   (non-wildcard) entries in your SSH config and known_hosts files. It supports Mosh,
   too!