pauper 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f0dab255dae6b6196868eea8e2016270e5ea73f
-  data.tar.gz: cfa3ea39f81b96138e5e9a88a74c0c68828ad0ff
+  metadata.gz: 589978903d478bbfdf3beb1be05ecfbb6fb70bf7
+  data.tar.gz: 8233aa486d0ec6198bbba31fadce7d548718b2eb
 SHA512:
-  metadata.gz: 812e2334e9c6175ea488e9591d17d41ae5fc3878ab296ce460dab41569be2cbdbac973b001f16dc22a0e769cf155edf53b5c0fbbae059f6e10d36b08281e1e8e
-  data.tar.gz: 381672d09740e94c5efe17e6eb3da403040aece3acc5456b6ea24e054711564f2c9f3699d70d5b7c4c83062ee478bf8eb08f5da423e3afc8f99ef59e15d98afb
+  metadata.gz: 1d7d522f39270b10f2d5485ba6a2553e4c9cb45984e8c689556964226957bd27a37cd4d876c0f4199ac543552e0cb3f3c8eb3703bbe1ba63633270ef36c3e414
+  data.tar.gz: 33e72c961f56f25bace2f933455dce6532dc73ecc32feb0172a9fce3400c5f2779d1890219721dee2298b1b66d36114cc1fb7b155d955d0525a29153ca8fb474

data/README.md

@@ -77,6 +77,19 @@ haveged generates the needed entropy for you and should slove this issue. Feel
 free to `kill` haveged when you are done (it will run forever, hiding in the
 background if you do not :P )
 
+Upgrading
+-------------------------------------------------------------------------------
+To update the Pauper gem from your local files:
+
+```
+rake install
+```
+
+To update the Pauper gem from RubyGems:
+
+```
+gem update pauper
+```
 
 TIPS
 --------------------------------------------------------------------------------
@@ -89,6 +102,7 @@ If this script does not exist you may have to pull master or if you
 would prefer to do it the hard way...
 
 OSX users:
+
 1. SSH into your VM
 2. `cd` into your `pauper-env` directory
 3. `pauper stop`
@@ -100,3 +114,4 @@ OSX users:
 9. `pauper setup_osx`
 
 This will hopefully get you into a happy state... Hopefully...
+

data/bin/pauper

@@ -1,38 +1,28 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'thor'
 require 'pauper'
 require 'fusion'
 
-# Check for new versions on startup
-
+# ignore the earlier opt-out-time flag
 SKIP_VERSION_CHECK_FLAG = '--skip-version-check'
-unless ARGV.include?(SKIP_VERSION_CHECK_FLAG)
-  current_version = Gem.loaded_specs['pauper'].version
-  latest_version = Gem.latest_version_for('pauper')
-  if current_version < latest_version
-    puts "It's your lucky day! There's a new version of Pauper available. You're on #{current_version}. Latest is #{latest_version}."
-    puts "You can skip this check with the #{SKIP_VERSION_CHECK_FLAG} flag, if you really must."
-    exit
-  end
-end
 ARGV.delete(SKIP_VERSION_CHECK_FLAG)
 
 # Make sure PATH is what ubuntu expects it to be
 ENV['PATH']='/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin'
 
-require 'vmx'
-
 module Pauperism
   class Vm < Thor
-    class_option :vmpath, :type => :string
-    class_option :vmrunpath, :type => :string # TODO: implement
-
     no_commands do
-      def fusion(vmpath=Fusion::DEFAULT_VMPATH)
-        vmpath = File.expand_path(options[:vmpath]) if options[:vmpath]
-        @fusion ||= Fusion.new(vmpath)
+      def pauper
+        return @pauper if @pauper
+        pauperfile = File.expand_path(options[:pauperfile]) if options[:pauperfile]
+        @pauper = Pauper.new(true, pauperfile)
+      end
+
+      def fusion
+        return @fusion if @fusion
+        @fusion = Fusion.new(pauper.config.config[:vm_path])
       end
     end
 
@@ -159,37 +149,22 @@ module Pauperism
       pauper.write_hosts
     end
 
-    desc 'setup_osx [VMNAME]', 'Set up things for OS X'
-    def setup_osx(vm_path=Fusion::DEFAULT_VMPATH)
+    desc 'setup_osx', 'Set up things for OS X'
+    def setup_osx
       unless Pauper.osx?
         puts 'Not OSX! I refuse!'
         exit
       end
       pauper(true)
 
-      vmx_file = Fusion.new(vm_path).vmx
-      vmx = VMX.new(vmx_file)
-
-      mac = vmx.data['ethernet0.generatedAddress']
-      arpmac = mac.gsub(/0([0-9a-fA-F])/, '\1') # switch it to the format that arp likes
-
-      match = `arp -a | grep -i #{arpmac}`.match(/\(([0-9.]+)\)/)
-      unless match
-        puts "Could not find any running VM with MAC addr: #{arpmac}"
-        puts " >> Manually SSH into the VM then try again <<"
-        exit
-      end
-
-      ip = match.captures[0]
-
       # Set up DHCPD
-      pauper.setup_osx_dhcpd(mac, ip)
+      pauper.setup_osx_dhcpd(fusion.mac, fusion.ip)
 
       # Set up route
-      pauper.setup_osx_routes(ip)
+      pauper.setup_osx_routes(fusion.ip)
 
       # Write hosts
-      pauper.write_osx_hosts(ip)
+      pauper.write_osx_hosts(fusion.ip)
     end
 
     desc "up", "Start all nodes on your vm from local!"
@@ -209,9 +184,15 @@ module Pauperism
     end
 
     no_commands do
-      def pauper(ignore_network=false, pauperfile=Pauper::DEFAULT_PAUPERFILE)
+      def pauper(ignore_network=false)
+        return @pauper if @pauper
         pauperfile = File.expand_path(options[:pauperfile]) if options[:pauperfile]
-        @pauper ||= Pauper.new(ignore_network, pauperfile)
+        @pauper = Pauper.new(ignore_network, pauperfile)
+      end
+
+      def fusion
+        return @fusion if @fusion
+        @fusion = Fusion.new(pauper.config.config[:vm_path])
       end
     end
 

data/lib/fusion.rb

@@ -99,9 +99,9 @@ class Fusion
       puts "I can't find your VM. Try passing in a path to the <name>.vmwarevm dir."
       exit
     elsif vms.size > 1
-      puts "I'm not sure which VM I should use! Try passing one of these options:"
+      puts "I'm not sure which VM I should use! Try adding one of these to your Pauperfile:"
       vms.each do |vm|
-        puts "\t--vmpath=#{vm}"
+        puts "\tvm_path \"#{vm}\""
       end
       exit
     end
@@ -109,4 +109,23 @@ class Fusion
     # Return .vmx file
     Dir[vms[0] + '/*.vmx'][0]
   end
+
+  def ip
+    # switch mac to the format that arp likes
+    arpmac = mac.gsub(/0([0-9a-fA-F])/, '\1')
+
+    match = `arp -a | grep -i #{arpmac}`.match(/\(([0-9.]+)\)/)
+    unless match
+      puts "Could not find any running VM with MAC addr: #{arpmac}"
+      puts " >> Manually SSH into the VM then try again <<"
+      exit
+    end
+
+    return match.captures[0]
+  end
+
+  def mac
+    vmx = VMX.new(self.vmx)
+    return vmx.data['ethernet0.generatedAddress']
+  end
 end

data/lib/pauper.rb

@@ -22,7 +22,8 @@ class Pauper
   DEFAULT_VM_PATH = File.expand_path('/var/lib/lxc/')
   SUPPORTED_RELEASES = [:lucid, :precise]
 
-  def initialize(ignore_network = false, pauperfile = DEFAULT_PAUPERFILE)
+  def initialize(ignore_network = false, pauperfile = nil)
+    pauperfile = DEFAULT_PAUPERFILE if pauperfile.nil?
     if root?
       puts "Don't run as root!"
       exit
@@ -30,6 +31,28 @@ class Pauper
 
     @pauper_config = Pauper::Config.new(pauperfile)
     setup_network unless ignore_network
+    check_for_new_version
+  end
+
+  def check_for_new_version
+    begin
+      settings = pauper_settings()
+    rescue NoMethodError
+      settings = {skip_version_check: false}
+    end
+    unless settings[:skip_version_check]
+      current_version = Gem.loaded_specs['pauper'].version
+      latest_version = Gem.latest_version_for('pauper')
+      if current_version < latest_version
+        puts
+        puts "***************************************************************"
+        puts "It's your lucky day! There's a new version of Pauper available."
+        puts "You're on #{current_version}. Latest is #{latest_version}."
+        puts "***************************************************************"
+        puts
+        exit 1
+      end
+    end
   end
 
   def root?
@@ -105,10 +128,6 @@ class Pauper
     stop_node(base_name)
   end
 
-  def username
-    ENV['USER']
-  end
-
   def ssh_key
     @ssh_key ||= begin
       key = @pauper_config.config[:bootstrap_ssh_key] || "/home/#{username}/.ssh/id_rsa"
@@ -237,7 +256,7 @@ EOF
     }.merge(config[:chef_options]).merge(node_config.config[:chef_options])
 
     puts "Uploading Chef files..."
-    Net::SCP.start ip, ENV['USER'] do |scp|
+    Net::SCP.start ip, username do |scp|
       scp.upload! tmp_client_rb_path, "client.rb"
       scp.upload! config[:validation_key_path], "validation.pem"
       scp.upload! StringIO.new(chef_attribs.to_json), "client-config.json"
@@ -246,7 +265,7 @@ EOF
     FileUtils.rm(tmp_client_rb_path)
 
     puts "Connecting over SSH..."
-    Net::SSH.start ip, ENV['USER'] do |ssh|
+    Net::SSH.start ip, username do |ssh|
       ssh_exec ssh, "sudo mv client.rb /etc/chef/"
       ssh_exec ssh, "sudo mv validation.pem /etc/chef/"
       ssh_exec ssh, "sudo mv client-config.json /etc/chef/"
@@ -364,8 +383,16 @@ EOF
   end
 
   def start_all
+    skipped = Array.new
     puts "Starting all nodes..."
-    @pauper_config.config[:nodes].each { |n| start(n.name) }
+    @pauper_config.config[:nodes].each do |n|
+      if n.config[:optional]
+        skipped << n.name
+      else
+        start(n.name) unless n.config[:optional]
+      end
+    end
+    puts "Skipped: [#{skipped.join(', ')}]" unless skipped.empty?
   end
 
   def stop_all
@@ -466,7 +493,7 @@ EOF
                     'Enter passphrase for '] # key waiting for password...
     puts "\e[32m====> SSH >===="
     lines = 0
-    Net::SSH.start ip, ENV['USER'], {:forward_agent => true} do |ssh|
+    Net::SSH.start ip, username, {:forward_agent => true} do |ssh|
       ssh.open_channel do |channel|
         channel.request_pty do |ch, success| # Needed for password responses
           abort('Failed to get pty...') unless success
@@ -633,6 +660,7 @@ EOF
         :nodes => [],
         :ssh_user => 'dev',
         :ssh_password => 'password',
+        :vm_path => Fusion::DEFAULT_VMPATH,
         :run_list => [],
         :shares => [],
         :subnet => '172.16.254',
@@ -675,6 +703,10 @@ EOF
       @config[:subnet] = net
     end
 
+    def vm_path(path)
+      @config[:vm_path] = File.expand_path(path)
+    end
+
     def vmx(vmx_file)
       @config[:vmx] = File.expand_path(vmx_file)
     end
@@ -745,6 +777,7 @@ EOF
           :run_list => [],
           :chef_options => {},
           :release => :lucid,
+          :optional => false,
         }
         instance_eval &block
       end
@@ -776,6 +809,10 @@ EOF
       def release(release_s)
         @config[:release] = Pauper.grok_release(release_s)
       end
+
+      def optional(v=true)
+        @config[:optional] = v
+      end
     end
   end
 end

data/lib/pauper/version.rb

@@ -1,3 +1,3 @@
 class Pauper
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pauper
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tyler McMullen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -116,4 +116,3 @@ summary: A semi-sane way to manage a multi-vm dev environment
 test_files:
 - test/pauper_test.rb
 - test/test_helper.rb
-has_rdoc: