awslanes 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d072ed56adc4c6f6211370b5e46e499b0a6588f
-  data.tar.gz: ec38a657af92f32bb0fd18cffce2467ade3ef437
+  metadata.gz: 33a1d141bec973da05d80ff867e9bd85a9fdd69d
+  data.tar.gz: aa9e4e8b1b169f9fe6d103797d8f2ae6b113987e
 SHA512:
-  metadata.gz: faa63eeea13925c549668162254e4e8f730dc459fd2b7d2f77686a996315b61030d0c9214bbb3f93583a5833563ed62e152a413bcbc0b52cae952733d3725006
-  data.tar.gz: 83103bf61c7306333fd64e1ef1bf55b1f60cf8c9fe327bca02db0bba0b3d309df627c5e5e6020cc33454552767f43ac13c3772a20b377de91355ae924c68768b
+  metadata.gz: 72efffc58cd8d963f0a273344ee5f30fea13c6ffbb3cdf2d25aa6676d970e09f33d03df55b5fc58870a13457fcfd59b0bb6ebc5ac5daaeaffde0b40a7f3b6abc
+  data.tar.gz: 7be57d9008903becff74fddd6f34d22ce36de19ad262a18b2b191db37a178243810875de5c5b174d5ce773d7097066fb3d37dcad546d1e917f888725aea0d7ab

data/.gitignore

@@ -12,4 +12,5 @@
 *.o
 *.a
 mkmf.log
-*.gem
+*.gem
+.idea

data/awslanes.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency "thor"
-  spec.add_dependency "awscli"
-  spec.add_dependency "rest_client"
+  spec.add_dependency "thor", "~> 0"
+  spec.add_dependency "awscli", "~> 0"
+  spec.add_dependency "net-ssh", "~> 0"
+  spec.add_dependency "rest-client", "~> 0"
 end

data/bin/lanes

@@ -2,17 +2,4 @@
 
 require 'lanes'
 
-# load the Lanes settings file
-config = YAML.load_file( ENV['HOME'] + '/.lanes/lanes.yml')
-profile = config['profile']
-
-# hijack the AwsCli file variable
-ENV['AWSCLI_CONFIG_FILE']="~/.lanes/#{profile}.yml"
-
-# Populate our properties singleton as well
-settings = YAML.load_file( ENV['HOME'] + "/.lanes/#{profile}.yml")
-
-Props.instance.set(settings)
-
-LanesCli::Lanes.start( ARGV )
-# TODO close the connection in the singleton
+LanesCli::Lanes.start( ARGV )

data/lib/lanes.rb

@@ -1,9 +1,9 @@
-
-require "lanes/version"
-require "lanes/aws"
-require "lanes/props"
-require "lanes/file"
-require "thor"
+require 'net/ssh'
+require 'lanes/version'
+require 'lanes/aws'
+require 'lanes/props'
+require 'lanes/file'
+require 'thor'
 require 'yaml'
 require 'awscli'
 require 'rest_client'
@@ -17,16 +17,14 @@ module LanesCli
       data = YAML.load_file path
       data["profile"] = profile
       File.open(path, 'w') { |f| YAML.dump(data, f) }
+
       puts "Switched to #{profile}"
     end
 
-
-
-
     desc "list [LANE]", "Lists all servers name + ip + Instance ID, optionally filtered by lane 2"
     def list(lane=nil)
       servers = AWS.instance.fetchServers(lane)
-      servers.sort_by{ |s| s[:lane] }
+      servers.sort_by!{ |s| [s[:lane], s[:name]] }
       servers.each{|server|
         puts "\t%{name} (%{lane}) \t %{ip} \t %{id} " % server
       }
@@ -37,10 +35,11 @@ module LanesCli
       chosen = chooseServer(lane)
       if chosen != nil
         mods = Props.instance.sshMod(chosen[:lane])
-        identity = if mods['identity'] then '-i ' + mods['identity'] else '' end
-        tunnel = if mods['tunnel'] then '-L' + mods['tunnel'] else '' end
-        user = if mods['user'] then mods['user'] else 'ec2-user' end
-        cmd = "ssh #{user}@%{ip} #{identity} #{tunnel}" % chosen
+        identity = "-i #{mods['identity']}" if mods['identity']
+        tunnels = "-L#{mods['tunnel']}" if mods['tunnel']
+        tunnels = mods['tunnels'].map{|tunnel| "-L#{tunnel}"}.join(' ') if mods['tunnels']
+        user = mods['user'] ? mods['user'] : 'ec2-user'
+        cmd = "ssh #{user}@%{ip} #{identity} #{tunnels}" % chosen
         exec cmd
       else
         puts 'Canceled'
@@ -145,9 +144,9 @@ module LanesCli
 
 
     no_commands{
-      def chooseServer(lane=nul)
+      def chooseServer(lane=nil)
         servers = AWS.instance.fetchServers(lane)
-        servers.sort_by{ |s| s[:lane] }
+        servers.sort_by!{ |s| [s[:lane], s[:name]] }
 
         puts "Available Servers: "
         servers.each_with_index {|server, index|
@@ -161,23 +160,21 @@ module LanesCli
     }
   end
 
-  ################################################################
-  # IMPORTANT: IF YOU CHANGE STUFF BELOW, CHANGE IT IN bin/lanes #
-  ################################################################
-  if ENV['RUBYMINE'] != nil
-    # load the Lanes settings file
-    config = YAML.load_file( ENV['HOME'] + '/.lanes/lanes.yml')
-    profile = config['profile']
+  # load the Lanes settings file
+  lanes_config = YAML.load_file( ENV['HOME'] + '/.lanes/lanes.yml')
+  profile = lanes_config['profile']
+  profile_config_path = ENV['HOME'] + "/.lanes/#{profile}.yml"
 
+  if File.exist? profile_config_path
     # hijack the AwsCli file variable
-    ENV['AWSCLI_CONFIG_FILE']="~/.lanes/#{profile}.yml"
+    ENV['AWSCLI_CONFIG_FILE']=profile_config_path
 
     # Populate our properties singleton as well
-    settings = YAML.load_file( ENV['HOME'] + "/.lanes/#{profile}.yml")
+    settings = YAML.load_file profile_config_path
 
     Props.instance.set(settings)
 
-    LanesCli::Lanes.start( ENV['RUBYMINE'].split(' ') )
     # TODO close the connection in the singleton
   end
+
 end

data/lib/lanes/version.rb

@@ -1,3 +1,3 @@
 module AwsLanes
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,83 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: awslanes
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Dave Welch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awscli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest_client
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Manage "lanes" of AWS machines, according to [principle here]
@@ -88,7 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -112,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Manage "lanes" of AWS machines