pvcglue 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b8ffc336dfdd07570db2d254d7aa3e3962bc46e
-  data.tar.gz: e916de10d914a58ce35a64749afe31bc02a7c023
+  metadata.gz: e429dc7a4b50158ce2a1929e7b652e07030993a0
+  data.tar.gz: f24bc8d081da32c682c3d0b60715aebc24425fd8
 SHA512:
-  metadata.gz: 4edb635b8bc3662bb47670b857cfdeb82920dceb7b181da8393c7f6c8ad4d9322008f2cf5df9f50bca0d5babfb3716ff1e5e6295e626b29b3b111d11da41395b
-  data.tar.gz: ed7dfcc56e2f5df166259ad84c38d647ff5fd4b29c35a77ea58bfe51af8a78b7115d42ea1492166a15f907459ab706928449d508940f48c40c41d346afa78a74
+  metadata.gz: e8b4ecd0470e63aefd7299b8d7c6d37804a0b8503c8a7800e83a73ef21add4b49816e58266935774af4668bc1471c0a1d2ea66a0ae8ed54c4245dcfc0f303380
+  data.tar.gz: aad57eb0dfc27b89ee3e71b47d91363e570780f079c4566326e3108d3d242e1e5352a748fca39e50b4fdf194a6a2db6751d265f2cd37667b6b5613c6c2a6664e

data/lib/pvcglue/cloud.rb

@@ -162,6 +162,9 @@ 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
 
@@ -179,6 +182,7 @@ module Pvcglue
       from_all = data[app_name][:ssh_allowed_from_all_port].to_i
       ports << from_all if from_all > 0
       ports.concat [80, 443] if current_node.values.first[:allow_public_access]
+      ports.concat ["2000:3000"] if stage_name == 'local'
       ports
     end
 

data/lib/pvcglue/configuration.rb

@@ -137,12 +137,16 @@ module Pvcglue
         File.join(application_dir, 'tmp')
       end
 
+      def pvcglue_tmp_dir
+        File.join(tmp_dir, 'pvcglue')
+      end
+
       def cloud_cache_file_name
         # Just in case the Rails project hasn't yet been run, make sure the tmp
         # dir exists.
-        Dir.mkdir(tmp_dir) unless Dir.exist?(tmp_dir)
+        Dir.mkdir(pvcglue_tmp_dir) unless Dir.exist?(pvcglue_tmp_dir)
 
-        File.join(tmp_dir, "pvcglue_#{cloud_manager}_#{cloud_name}_#{application_name}_cache.toml")
+        File.join(pvcglue_tmp_dir, "pvcglue_#{cloud_manager}_#{cloud_name}_#{application_name}_cache.toml")
       end
 
       def clear_cloud_cache

data/lib/pvcglue/env.rb

@@ -117,6 +117,8 @@ module Pvcglue
 
     def self.read_cached_stage_env
       # TODO:  Only use cache in development of gem, do not cache by default, use Manager config
+      return false # disable cache for now
+
       if File.exists?(stage_env_cache_file_name)
         stage_env = File.read(stage_env_cache_file_name)
         Pvcglue.cloud.stage_env = TOML.parse(stage_env)
@@ -134,7 +136,7 @@ module Pvcglue
     end
 
     def self.stage_env_cache_file_name
-      File.join(Pvcglue.configuration.tmp_dir, "pvcglue_cache_#{stage_env_file_name_base}")
+      File.join(Pvcglue.configuration.pvcglue_tmp_dir, "pvcglue_cache_#{stage_env_file_name_base}")
     end
 
     def self.clear_stage_env_cache

data/lib/pvcglue/local.rb

@@ -15,8 +15,11 @@ module Pvcglue
     end
 
     def self.start
+      FileUtils.rm_rf(local_cache_dir)
+
       if vagrant("up #{machines_in_stage}")
         update_local_config(get_info_for_machines)
+        get_ssh_config
       else
         remove_cache_info_for_machines
         raise(Thor::Error, "Error starting virtual machines.  :(")
@@ -28,7 +31,7 @@ module Pvcglue
     end
 
     def self.update_local_config_from_cache
-      data = File.read(cache_file_name)
+      data = File.read(machine_cache_file_name)
       machines = JSON.parse(data)
       update_local_config(machines)
     end
@@ -133,7 +136,7 @@ module Pvcglue
 
       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.dump(Pvcglue.cloud.data))
+      File.write(Pvcglue.configuration.cloud_cache_file_name, TOML::PvcDumper.new(Pvcglue.cloud.data).toml_str)
     end
 
     def self.stop
@@ -166,7 +169,7 @@ module Pvcglue
     end
 
     def self.remove_cache_info_for_machines
-      File.delete(cache_file_name)
+      File.delete(machine_cache_file_name)
     end
 
 =begin
@@ -213,14 +216,40 @@ module Pvcglue
         # 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(cache_file_name)) # the 'tmp' directory may not always exist
-      File.write(cache_file_name, machines.to_json)
+      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)
       machines
     end
 
-    def self.cache_file_name
+    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))
+    end
+
+    def self.local_cache_dir
+      Pvcglue.configuration.pvcglue_tmp_dir
+    end
+
+    def self.machine_cache_file_name
+      # TODO:  Remove caching, maybe?
+      File.join(local_cache_dir, 'pvcglue-machines.json')
+    end
+
+    def self.ssh_config_cache_file_name
       # TODO:  Remove caching, maybe?
-      File.join(Pvcglue::Configuration.application_dir, 'tmp', 'pvcglue-machines.json')
+      File.join(local_cache_dir, 'pvcglue-ssh-config.json')
     end
   end
 

data/lib/pvcglue/manager.rb

@@ -130,6 +130,7 @@ module Pvcglue
     end
 
     def self.read_cached_cloud_data
+      return false # disable cache for now
       # TODO:  Expire cache after given interval
       if File.exists?(Pvcglue.configuration.cloud_cache_file_name)
         data = File.read(Pvcglue.configuration.cloud_cache_file_name)

data/lib/pvcglue/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler