pvcglue 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e429dc7a4b50158ce2a1929e7b652e07030993a0
-  data.tar.gz: f24bc8d081da32c682c3d0b60715aebc24425fd8
+  metadata.gz: 6c0c298368758b219ada1c59b9295cb38e27c787
+  data.tar.gz: 379a85589243740d2c758fe7494746095376023a
 SHA512:
-  metadata.gz: e8b4ecd0470e63aefd7299b8d7c6d37804a0b8503c8a7800e83a73ef21add4b49816e58266935774af4668bc1471c0a1d2ea66a0ae8ed54c4245dcfc0f303380
-  data.tar.gz: aad57eb0dfc27b89ee3e71b47d91363e570780f079c4566326e3108d3d242e1e5352a748fca39e50b4fdf194a6a2db6751d265f2cd37667b6b5613c6c2a6664e
+  metadata.gz: 2c6cd78e75c63ef6068100e38b358ab4c292ba79db7a5e53ac5ffe4fd39ac470e643801d6b7484b945c86b88188a8b7e98786c0fc58336670ca13af5bbe7504e
+  data.tar.gz: f936147aec4e862349af6cedd195e234ca451ef4a7c60b430b634ead48905614a3fbe75afecf1c5964bbe9894eff85453a338436d36743d8553a31d90516120a

data/lib/pvcglue/cloud.rb

@@ -162,9 +162,6 @@ module Pvcglue
       ports = []
       from_all = data[app_name][:ssh_allowed_from_all_port].to_i
       ports << from_all if from_all > 0
-      if stage_name == 'local'
-        Pvcglue::Local.ssh_config.each { |_, port| ports << port } # Yes, this is a hack, and should be refactored.  :)
-      end
       ports
     end
 
@@ -191,6 +188,10 @@ module Pvcglue
       addresses = dev_ip_addresses
       addresses.concat(stage_internal_addresses)
       # puts addresses.inspect
+      if stage_name == 'local'
+        addresses << Pvcglue::Local.vagrant_config # Yes, this is a hack, and should be refactored.  :)
+      end
+      # puts addresses.inspect
       addresses
     end
 

data/lib/pvcglue/local.rb

@@ -19,7 +19,7 @@ module Pvcglue
 
       if vagrant("up #{machines_in_stage}")
         update_local_config(get_info_for_machines)
-        get_ssh_config
+        # get_ssh_config
       else
         remove_cache_info_for_machines
         raise(Thor::Error, "Error starting virtual machines.  :(")
@@ -36,6 +36,15 @@ module Pvcglue
       update_local_config(machines)
     end
 
+    def self.get_user_ip_address
+      result = `ip route get 8.8.8.8 2>&1 | awk '{print $NF; exit}'`.strip # Ubuntu
+      result = `ipconfig getifaddr en0 2>&1` unless result =~ /\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/ # OSX
+      raise "IP Address not found" unless result =~ /\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/
+      puts "*"*80
+      puts "Machine IP address #{result}"
+      result
+    end
+
     def self.update_local_config(machines)
       machines = machines.with_indifferent_access
       Pvcglue::Manager.set_local_mode
@@ -64,7 +73,7 @@ module Pvcglue
                      "swapfile_size" => 128,
                      "time_zone" => "America/Los_Angeles",
                      "authorized_keys" => {"example" => File.read(File.expand_path('~/.ssh/id_rsa.pub'))}, # TODO: error checking
-                     "dev_ip_addresses" => {"example" => "127.0.0.1"},
+                     "dev_ip_addresses" => {"local" => "127.0.0.1", "user" => get_user_ip_address},
                      "gems" => {"delayed_job" => false, "whenever" => false},
                      "stages" =>
                          {"local" =>
@@ -131,12 +140,17 @@ module Pvcglue
       data[app_name][:stages][stage_name][:roles][:lb][:lb][:private_ip] = machines[:lb][:private_ip]
       data[app_name][:stages][stage_name][:roles][:web][:web_1][:public_ip] = machines[:web][:public_ip]
       data[app_name][:stages][stage_name][:roles][:web][:web_1][:private_ip] = machines[:web][:private_ip]
+
+      data[app_name][:dev_ip_addresses] = {"local" => "127.0.0.1", "user" => get_user_ip_address}
+      data[app_name][:stages][stage_name][:domains] = [machines[:lb][:public_ip]]
+
       # data[app_name][:stages][:local][:roles][:web][:web_2][:public_ip] = machines[:web_2][:public_ip]
       # data[app_name][:stages][:local][:roles][:web][:web_2][:private_ip] = machines[:web_2][:private_ip]
 
-      Pvcglue.cloud.data = data
+          Pvcglue.cloud.data = data
       File.write(::Pvcglue.cloud.local_file_name, TOML.dump(Pvcglue.cloud.data))
       File.write(Pvcglue.configuration.cloud_cache_file_name, TOML::PvcDumper.new(Pvcglue.cloud.data).toml_str)
+      puts TOML::PvcDumper.new(Pvcglue.cloud.data).toml_str
     end
 
     def self.stop
@@ -202,6 +216,7 @@ module Pvcglue
 
     def self.get_info_for_machines
       machines = {}
+      vagrant_ips = []
       MACHINES.each do |machine|
         machines[machine] = {}
         machine_name = machine == 'manager' ? machine : "#{Pvcglue.cloud.stage_name}-#{machine}"
@@ -212,30 +227,39 @@ module Pvcglue
           type = eth == 'eth2' ? :private_ip : :public_ip
           machines[machine][type] = ip
         end
+        data.scan(/inet (.*)\/.*global (eth0)/) do |ip, eth|
+          vagrant_ips << ip
+        end
         puts "Adding you public key to the root user for #{machine_name}..."
         # cat ~/.ssh/id_rsa.pub | vagrant ssh manager -c 'sudo tee /root/.ssh/authorized_keys'
         raise $? unless system %Q(cat ~/.ssh/id_rsa.pub | vagrant ssh #{machine_name} -c 'sudo tee /root/.ssh/authorized_keys')
       end
       FileUtils.mkdir_p(File.dirname(machine_cache_file_name)) # the 'tmp' directory may not always exist
       File.write(machine_cache_file_name, machines.to_json)
+      FileUtils.mkdir_p(File.dirname(vagrant_config_cache_file_name)) # the 'tmp' directory may not always exist
+      File.write(vagrant_config_cache_file_name, vagrant_ips.to_json)
       machines
     end
 
-    def self.get_ssh_config
-      data = `vagrant ssh-config`
-      puts data
-      out = {}
-      data.scan(/Host (.*?)$.*?Port (.*?)$/m) do |host_name, port|
-        out[host_name] = port
-      end
-      FileUtils.mkdir_p(File.dirname(ssh_config_cache_file_name)) # the 'tmp' directory may not always exist
-      File.write(ssh_config_cache_file_name, out.to_json)
-      puts out.inspect
-      out
-    end
+    # def self.get_ssh_config
+    #   data = `vagrant ssh-config`
+    #   puts data
+    #   out = {}
+    #   data.scan(/Host (.*?)$.*?Port (.*?)$/m) do |host_name, port|
+    #     out[host_name] = port
+    #   end
+    #   FileUtils.mkdir_p(File.dirname(ssh_config_cache_file_name)) # the 'tmp' directory may not always exist
+    #   File.write(ssh_config_cache_file_name, out.to_json)
+    #   puts out.inspect
+    #   out
+    # end
 
-    def self.ssh_config
-      JSON.parse(File.read(ssh_config_cache_file_name))
+    def self.vagrant_config
+      ips = JSON.parse(File.read(vagrant_config_cache_file_name))
+      # puts ips.inspect
+      ip = ips.first
+      parts = ip.split('.')
+      parts[0..2].join('.') + '.0/24'
     end
 
     def self.local_cache_dir
@@ -247,7 +271,7 @@ module Pvcglue
       File.join(local_cache_dir, 'pvcglue-machines.json')
     end
 
-    def self.ssh_config_cache_file_name
+    def self.vagrant_config_cache_file_name
       # TODO:  Remove caching, maybe?
       File.join(local_cache_dir, 'pvcglue-ssh-config.json')
     end

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = "0.1.21"
+  VERSION = "0.1.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Andrew Lyric