awslanes 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37d90d5f27a2891f0a42b2d35da7865a187a5861
-  data.tar.gz: 95aaf39d579f4bfb653241f7c62cd92c80724435
+  metadata.gz: 4d072ed56adc4c6f6211370b5e46e499b0a6588f
+  data.tar.gz: ec38a657af92f32bb0fd18cffce2467ade3ef437
 SHA512:
-  metadata.gz: 48df3eb16491ede1992270ff40fa12a8557402d2cb2b60828817fba11dbd140d8e2b874c64ec358a0bf5b1a9e5582a7ccff3354f133bd4084d2c34e6f52f607d
-  data.tar.gz: 97c6ef8db23064ee54dec28009da504c98d92152af955e855641a583ddcf411fcd42b87b7cd20fae647ad03735c706054c4a90914ede24367b2907782192e88a
+  metadata.gz: faa63eeea13925c549668162254e4e8f730dc459fd2b7d2f77686a996315b61030d0c9214bbb3f93583a5833563ed62e152a413bcbc0b52cae952733d3725006
+  data.tar.gz: 83103bf61c7306333fd64e1ef1bf55b1f60cf8c9fe327bca02db0bba0b3d309df627c5e5e6020cc33454552767f43ac13c3772a20b377de91355ae924c68768b

data/bin/lanes

@@ -13,6 +13,6 @@ ENV['AWSCLI_CONFIG_FILE']="~/.lanes/#{profile}.yml"
 settings = YAML.load_file( ENV['HOME'] + "/.lanes/#{profile}.yml")
 
 Props.instance.set(settings)
-Lanes.start(ARGV)
 
+LanesCli::Lanes.start( ARGV )
 # TODO close the connection in the singleton

data/changelog.md

@@ -0,0 +1,4 @@
+# 0.0.4
+- Added ability to "switch" profiles
+- Configurable delay on 'sh' via `--urlConfirmDelay` property
+- Added initial file support, with ability to push files (see `lanes file push`)

data/lib/lanes.rb

@@ -1,155 +1,183 @@
+
 require "lanes/version"
 require "lanes/aws"
 require "lanes/props"
+require "lanes/file"
 require "thor"
 require 'yaml'
 require 'awscli'
 require 'rest_client'
 
-class Lanes < Thor
-  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.each{|server|
-      puts "\t%{name} (%{lane}) \t %{ip} \t %{id} " % server
-    }
-  end
+module LanesCli
+  class Lanes < Thor
 
-  desc "ssh [LANE]", "Lists all servers name + ip + Instance ID, optionally filtered by lane, and prompts which one for ssh"
-  def ssh(lane=nil)
-    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
-
-      cmd = "ssh ec2-user@%{ip} #{identity} #{tunnel}" % chosen
-      exec cmd
-    else
-      puts 'Canceled'
+    desc "switch [profile]", "Switches AWS profiles (e.g. ~/.lanes/lanes.yml entry)"
+    def switch(profile)
+      path = ENV['HOME'] + '/.lanes/lanes.yml'
+      data = YAML.load_file path
+      data["profile"] = profile
+      File.open(path, 'w') { |f| YAML.dump(data, f) }
+      puts "Switched to #{profile}"
     end
-  end
 
-  method_option :cmd, :type => :array
-  method_option :urlConfirm, :type => :string
-  method_option :urlConfirmTimeout, :type => :numeric
-  method_option :v, :type => :boolean
-  method_option :confirm, :type => :boolean
-  desc "sh [LANE] ", "Executes a command on all machines with support for confirming an endpoint is available after"
-  def sh(lane)
-    servers = AWS.instance.fetchServers(lane)
-    servers.sort_by{ |s| s[:ip] }
-
-    puts "Available Servers: "
-    servers.each_with_index {|server|
-      puts "\t%{name} (%{lane}) \t %{ip} \t %{id} " % server
-    }
 
 
-    mods = Props.instance.sshMod(lane)
-    identity = if mods['identity'] then mods['identity'] else '' end
-    puts "Identity file #{mods['identity']} will be used" if identity
 
-    command = options[:cmd].join(' ')
-    if options[:confirm] then
-      puts "Confirmed via command line. Moving forward with execution of \"#{command}\" on these machines:"
-      confirm = 'CONFIRM'
-    else
-      confirm = ask "Type CONFIRM to execute \"#{command} \" on these machines:"
+    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.each{|server|
+        puts "\t%{name} (%{lane}) \t %{ip} \t %{id} " % server
+      }
     end
 
-    if confirm == 'CONFIRM' then
-      servers.each{ |server|
-        Net::SSH.start( server[:ip], 'ec2-user',
-          :keys => [identity],
-          # :verbose => :debug,
-          :encryption => "blowfish-cbc",
-          :compression => "zlib",
-          :host_key => "ssh-rsa") do |ssh|
-            puts "Executing on %{name} ( %{ip} ):\t #{command} \n" % server
-            stdout = ''
-            ssh.exec!(command) do |channel, stream, data|
-              stdout << data
-            end
-            puts "Completed. %{name}\n\tOutput: #{stdout}\n\n " % server
-          end
+    desc "ssh [LANE]", "Lists all servers name + ip + Instance ID, optionally filtered by lane, and prompts which one for ssh"
+    def ssh(lane=nil)
+      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
+        exec cmd
+      else
+        puts 'Canceled'
+      end
+    end
+
+
+    method_option :cmd, :type => :array
+    method_option :urlConfirm, :type => :string
+    method_option :urlConfirmTimeout, :type => :numeric
+    method_option :urlConfirmDelay, :type => :numeric
+    method_option :v, :type => :boolean
+    method_option :confirm, :type => :boolean
+    desc "sh [LANE] ", "Executes a command on all machines with support for confirming an endpoint is available after"
+    def sh(lane)
+      servers = AWS.instance.fetchServers(lane)
+      servers.sort_by{ |s| s[:ip] }
+
+      puts "Available Servers: "
+      servers.each_with_index {|server|
+        puts "\t%{name} (%{lane}) \t %{ip} \t %{id} " % server
       }
 
 
-      confirmPath = options[:urlConfirm]
-      if confirmPath != nil then
-        confirmTimeout = (options[:urlConfirmTimeout] or 30);
-        startTime = Time.new.to_i
-
-        # we better sleep for a few, otherwise the shutdown won't have executed
-        puts "Sleeping for 5 seconds, then trying the confirmation endpoint for #{confirmTimeout} seconds..."
-        sleep 5
-        while Time.new.to_i - startTime < confirmTimeout && servers.length > 0 do
-          servers.each_with_index{ |server, index|
-            begin
-              res = RestClient.get (confirmPath % server)
-              if res.code >= 200 && res.code < 300 then
-                puts "\t => #{server[:ip]} responded with #{res.code}"
-                servers.delete_at(index)
-              else
-                puts "\t XX #{server[:ip]} responded with #{res.code}" if options[:v]
+      mods = Props.instance.sshMod(lane)
+      identity = if mods['identity'] then mods['identity'] else '' end
+      puts "Identity file #{mods['identity']} will be used" if identity
+
+      command = options[:cmd].join(' ')
+      if options[:confirm] then
+        puts "Confirmed via command line. Moving forward with execution of \"#{command}\" on these machines:"
+        confirm = 'CONFIRM'
+      else
+        confirm = ask "Type CONFIRM to execute \"#{command} \" on these machines:"
+      end
+
+      if confirm == 'CONFIRM' then
+        servers.each{ |server|
+          user = if mods['user'] then mods['user'] else 'ec2-user' end
+          Net::SSH.start( server[:ip], user,
+            :keys => [identity],
+            # :verbose => :debug,
+            :encryption => "blowfish-cbc",
+            :compression => "zlib",
+            :host_key => "ssh-rsa") do |ssh|
+              puts "Executing on %{name} ( %{ip} ):\t #{command} \n" % server
+              stdout = ''
+              ssh.exec!(command) do |channel, stream, data|
+                stdout << data
               end
-            rescue => e
-              puts "\t XX #{server[:ip]} connection failed: #{e}" if options[:v]
+              puts "Completed. %{name}\n\tOutput: #{stdout}\n\n " % server
             end
-          }
+        }
+
+
+
+        confirmPath = options[:urlConfirm]
+        if confirmPath != nil then
+          confirmDelay = (options[:urlConfirmDelay] or 5)
+          confirmTimeout = (options[:urlConfirmTimeout] or 30);
+          startTime = Time.new.to_i
+
+          # we better sleep for a few, otherwise the shutdown won't have executed
+          puts "Sleeping for #{confirmDelay} seconds, then trying the confirmation endpoint for #{confirmTimeout} seconds..."
+          sleep confirmDelay
+          while Time.new.to_i - startTime < confirmTimeout && servers.length > 0 do
+            servers.each_with_index{ |server, index|
+              begin
+                res = RestClient.get (confirmPath % server)
+                if res.code >= 200 && res.code < 300 then
+                  puts "\t => #{server[:ip]} responded with #{res.code}"
+                  servers.delete_at(index)
+                else
+                  puts "\t XX #{server[:ip]} responded with #{res.code}" if options[:v]
+                end
+              rescue => e
+                puts "\t XX #{server[:ip]} connection failed: #{e}" if options[:v]
+              end
+            }
 
-          sleep 5 if servers.length > 0
-          puts "\t => #{servers.length} server(s) remaining..." if servers.length > 0
-        end
+            sleep 5 if servers.length > 0
+            puts "\t => #{servers.length} server(s) remaining..." if servers.length > 0
+          end
 
-        if servers.length == 0 then
-          puts "Successfully confirmed endpoints responded with a 2XX"
-        else
-          puts "The following server(s) did not respond with a 2XX:"
-          servers.each{ |server|
-            puts "\t%{name} (%{lane}) \t %{ip} \t %{id} " % server
-          }
+          if servers.length == 0 then
+            puts "Successfully confirmed endpoints responded with a 2XX"
+          else
+            puts "The following server(s) did not respond with a 2XX:"
+            servers.each{ |server|
+              puts "\t%{name} (%{lane}) \t %{ip} \t %{id} " % server
+            }
+          end
         end
+      else
+        puts 'Aborted!'
+        exit 1
       end
-    else
-      puts 'Aborted!'
-      exit 1
     end
-  end
 
+    desc 'file SUBCOMMAND ...ARGS', 'Push / pull files'
+    subcommand 'file', LanesCli::FileCmd
 
-  no_commands{
-    def chooseServer(lane=nul)
-      servers = AWS.instance.fetchServers(lane)
-      servers.sort_by{ |s| s[:lane] }
 
-      puts "Available Servers: "
-      servers.each_with_index {|server, index|
-        i = index + 1
-        puts "\t#{i}) %{name} (%{lane}) \t %{ip} \t %{id} " % server
-      }
+    no_commands{
+      def chooseServer(lane=nul)
+        servers = AWS.instance.fetchServers(lane)
+        servers.sort_by{ |s| s[:lane] }
 
-      choice = ask "Which server: "
-      chosen = servers[ choice.to_i - 1 ] if choice != ''
-    end
-  }
-end
+        puts "Available Servers: "
+        servers.each_with_index {|server, index|
+          i = index + 1
+          puts "\t#{i}) %{name} (%{lane}) \t %{ip} \t %{id} " % server
+        }
 
-if ENV['RUBYMINE'] != nil
-  # load the Lanes settings file
-  config = YAML.load_file( ENV['HOME'] + '/.lanes/lanes.yml')
-  profile = config['profile']
+        choice = ask "Which server: "
+        chosen = servers[ choice.to_i - 1 ] if choice != ''
+      end
+    }
+  end
 
-  # hijack the AwsCli file variable
-  ENV['AWSCLI_CONFIG_FILE']="~/.lanes/#{profile}.yml"
+  ################################################################
+  # 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']
 
-  # Populate our properties singleton as well
-  settings = YAML.load_file( ENV['HOME'] + "/.lanes/#{profile}.yml")
+    # hijack the AwsCli file variable
+    ENV['AWSCLI_CONFIG_FILE']="~/.lanes/#{profile}.yml"
 
-  Props.instance.set(settings)
-  Lanes.start( ENV['RUBYMINE'].split(' ') )
-  # TODO close the connection in the singleton
-end
+    # Populate our properties singleton as well
+    settings = YAML.load_file( ENV['HOME'] + "/.lanes/#{profile}.yml")
+
+    Props.instance.set(settings)
 
+    LanesCli::Lanes.start( ENV['RUBYMINE'].split(' ') )
+    # TODO close the connection in the singleton
+  end
+end

data/lib/lanes/file.rb

@@ -0,0 +1,47 @@
+require "thor"
+module LanesCli
+  class FileCmd < Thor
+
+    method_option :confirm, :type => :boolean
+    desc "push [target] [destination] [LANE]", "Pushes [file] to [destination] on all [LANE] instances "
+    def push(target, dest, lane=nil)
+      pwd = Dir.pwd
+      puts "#{pwd} #{target} #{dest} #{lane}"
+      file = "#{pwd}/#{target}"
+
+      servers = AWS.instance.fetchServers(lane)
+      servers.sort_by{ |s| s[:lane] }
+      puts 'Servers that will receive the file:'
+      servers.each{|server|
+        puts "\t%{name} (%{lane}) \t %{ip} \t %{id} " % server
+      }
+
+
+      mods = Props.instance.sshMod(lane)
+      identity = if mods['identity'] then mods['identity'] else '' end
+      puts "Identity file #{mods['identity']} will be used" if identity
+
+      if options[:confirm] then
+        puts 'Confirmed via command line. Moving forward with execution..'
+        confirm = 'CONFIRM'
+      else
+        confirm = ask 'Type CONFIRM to begin pushing files:'
+      end
+
+
+      if confirm == 'CONFIRM' then
+        servers.each{|server|
+          id = if identity then "-i #{identity}" else '' end
+          user = if mods['user'] then mods['user'] else 'ec2-user' end
+          cmd = "scp #{id} #{file} #{user}@%{ip}:#{dest}" % server
+          puts " => Executing: #{cmd}"
+          result = system cmd
+          if !result then
+            puts 'WARNING: Failed on %{ip}' % server
+          end
+        }
+      end
+
+    end
+  end
+end

data/lib/lanes/version.rb

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

data/notes.md

@@ -1,2 +1,4 @@
 To test it locally:
-```gem build awslanes.gemspec && gem install awslanes-*.gem```
+```
+gem build awslanes.gemspec && gem install awslanes-*.gem
+```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awslanes
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dave Welch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,8 +95,10 @@ files:
 - Rakefile
 - awslanes.gemspec
 - bin/lanes
+- changelog.md
 - lib/lanes.rb
 - lib/lanes/aws.rb
+- lib/lanes/file.rb
 - lib/lanes/props.rb
 - lib/lanes/version.rb
 - notes.md