pvcglue 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04b3f92f71e7038cd74f78ac832f0d93604cd2dc
-  data.tar.gz: e4cf248f20b858e705e2f81496f59f1557c0d428
+  metadata.gz: 08d6aad383e99c18d8c2b5bad479d8b6d601fd76
+  data.tar.gz: 240473fa85d1e22f130117e0ab779491d98d57a6
 SHA512:
-  metadata.gz: ad1bd550284cb3b4e7d59e980b7e14b4845d7d8a1185afdd832723914fe12cce6dd1a666e74bb4d6852cadc11e1ddf355cae17963c057291ec760b5cfa233da1
-  data.tar.gz: 71422b3c7ae4b4396b61018d4bdbb2ca57b1e59072bd3a2289b29523584be371808a0285d04b65bf63ecff05a803d7f1735221ca1a52284a55375a9d1de177e0
+  metadata.gz: 60793cba37e6cc407e001d84c3c86a2cbb656f255a037aafab8d053a362d1edb5ce1f7f2d9e7bae2e14747d4ef801432de4c8446678e6c1debb528b2df988d37
+  data.tar.gz: a14013284ab16ebb666ff8ddadb705a20220313d3156fef17b245122396743654f5114fd40ce424df34e10974a101c2b87789ae6c18f39ec8f9104b6c9ea5f07

data/README.md

@@ -1,3 +1,9 @@
+###
+There is an issue with gem 'tilt', '>=2.0.0', use
+
+    gem 'tilt', '<2.0.0'
+
+in your project's Gemfile, as a temporary workaournd.
 # PVC Glue
 
 Pico Virtual Cloud Glue creates a tightly integrated (very small) virtual cloud for your Rails application.
@@ -182,7 +188,7 @@ Notes:
 
     create main toml file
 
-    add maintenance/maintenance.html
+    add public/maintenance/maintenance.html
 
     pvc alpha bootstrap
     pvc alpha pvcify
@@ -191,12 +197,12 @@ Notes:
 
     modify config/initializers/secret_token.rb to include
 
-      if Rails.env.production?
-        Store::Application.config.secret_token = ENV['RAILS_SECRET_TOKEN'] || raise('No secret token specified.  :(')
-      else
-        Store::Application.config.secret_token = '1175ba3ce440d59b811fd9464c5657ca09f171535fd885719f263ddec3af6ef5df42c266d96868479357b7959b05cfcac7dd1663a696931c5f347c96665e1623'
-      end
-
+    if Rails.env.in?(%w(development test))
+      Rails.application.config.secret_token = 'This is insecure, please do not ever use in a publicly available application!'
+    else
+      Rails.application.config.secret_token = ENV['RAILS_SECRET_TOKEN'] || raise('No secret token specified.  :(')
+      raise('Secret token is too short.  :(') if Rails.application.config.secret_token.length < 30
+    end
 
 
 

data/bin/pvc

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
 require 'pvcglue/cli'
+require 'benchmark'
 
 # Allow use of Capistrano style environment syntax and convert to 'standard' syntax
 # Example:  `pvc production bootstrap` ==> `pvc bootstrap --stage=production`
 # TODO: refactor to use a list of user specified environments
-if ARGV.count >= 2 && %w[local test alpha beta gamma delta preview production staging all].include?(ARGV[0])
+if ARGV.count >= 2 && %w[local vmtest test alpha beta gamma delta preview production staging all].include?(ARGV[0])
   ARGV[0], ARGV[1] = ARGV[1], "--stage=#{ARGV[0]}"
 end
 
 # puts ARGV.inspect
-Pvcglue::CLI.start
-puts "----- Done -----"
+# puts Benchmark.measure { Pvcglue::CLI.start }
+puts "----- Done #{Benchmark.measure { Pvcglue::CLI.start }}"

data/lib/pvcglue.rb

@@ -20,6 +20,9 @@ require "tilt"
 # puts File.join(File.dirname(__FILE__), 'pvcglue', 'packages', '*.rb')
 
 module Pvcglue
+  mattr_accessor :command_line_options do
+    {}
+  end
 
   def self.gem_dir
     Gem::Specification.find_by_name('pvcglue').gem_dir

data/lib/pvcglue/cli.rb

@@ -5,10 +5,12 @@ require 'pvcglue'
 module Pvcglue
 
   class CLI < Thor
+    class_option :cloud_manager_override
 
     def initialize(args = [], local_options = {}, config = {})
       super
       Pvcglue.cloud.set_stage(options[:stage])
+      Pvcglue.command_line_options = options
       # puts "/\\"*80
       # puts options.inspect
       # puts "*"*80
@@ -24,6 +26,7 @@ module Pvcglue
 
     def info
       puts "Pvcglue version #{Pvcglue::Version.version}"
+      puts "Options:  #{options}"
       puts "  Manager settings:"
       Pvcglue.configuration.options.each { |k, v| puts "    #{k}=#{v}" }
     end
@@ -246,4 +249,5 @@ module Pvcglue
 
   end
 
+
 end

data/lib/pvcglue/local.rb

@@ -4,7 +4,7 @@ module Pvcglue
     MACHINES = %w(manager lb web db)
 
     def self.vagrant(command)
-      raise(Thor::Error, "This command can only be used for the 'local' and 'test' stages.") unless Pvcglue.cloud.stage_name.in? %w(local test)
+      raise(Thor::Error, "This command can only be used for the 'local' and 'vmtest' stages.") unless Pvcglue.cloud.stage_name.in? %w(local vmtest)
       raise(Thor::Error, "Vagrant (www.vagrantup.com) does not appear to be installed.  :(") unless vagrant_available?
       Bundler.with_clean_env { system("vagrant #{command}") }
     end
@@ -20,13 +20,13 @@ module Pvcglue
 
     def self.up
       start
-      system_live_out('pvc manager bootstrap')
-      system_live_out('pvc manager push')
-      system_live_out('pvc local pvcify')
-      system_live_out('pvc manager push')
-      system_live_out('pvc local bootstrap')
-      system_live_out('pvc local build')
-      system_live_out('pvc local deploy')
+      system_live_out("pvc manager bootstrap")
+      system_live_out("pvc manager push")
+      system_live_out("pvc #{Pvcglue.cloud.stage_name} pvcify")
+      system_live_out("pvc manager push")
+      system_live_out("pvc #{Pvcglue.cloud.stage_name} bootstrap")
+      system_live_out("pvc #{Pvcglue.cloud.stage_name} build")
+      system_live_out("pvc #{Pvcglue.cloud.stage_name} deploy")
     end
 
     def self.start

data/lib/pvcglue/manager.rb

@@ -1,6 +1,7 @@
 require 'pp'
 
 module Pvcglue
+
   class Manager < Thor
 
     desc "bootstrap", "bootstrap"
@@ -130,6 +131,11 @@ module Pvcglue
     end
 
     def self.read_cached_cloud_data
+      if Pvcglue.command_line_options[:cloud_manager_override]
+        data = File.read(Pvcglue.command_line_options[:cloud_manager_override])
+        Pvcglue.cloud.data = TOML.parse(data)
+        return true
+      end
       return false # disable cache for now
       # TODO:  Expire cache after given interval
       if File.exists?(Pvcglue.configuration.cloud_cache_file_name)

data/lib/pvcglue/packages.rb

@@ -6,11 +6,24 @@ module Pvcglue
       nodes.each do |node, data|
         orca_node = ::Orca::Node.new(node, data[:public_ip], {user: user, port: Pvcglue.cloud.port_in_context(context)})
         ::Pvcglue.cloud.current_node = {node => data}
+        tries = 3
         begin
-          orca_suite.run(orca_node.name, package.to_s, :apply)
-        ensure
-          ::Pvcglue.cloud.current_node = nil
-          ::Pvcglue.cloud.current_hostname = nil
+          begin
+            orca_suite.run(orca_node.name, package.to_s, :apply)
+          ensure
+            ::Pvcglue.cloud.current_node = nil
+            ::Pvcglue.cloud.current_hostname = nil
+          end
+        rescue
+          tries -= 1
+          if tries > 0
+            retry
+          else
+            puts "\n"*10
+            puts "*"*80
+            puts "ERROR, retrying..."
+            puts "*"*80
+          end
         end
       end
     end

data/lib/pvcglue/templates/database.yml.erb

@@ -59,3 +59,7 @@ production:
 local:
   <<: *default_settings
   database: <%= Pvcglue.cloud.app_name + '_local' %>
+
+vmtest:
+  <<: *default_settings
+  database: <%= Pvcglue.cloud.app_name + '_vmtest' %>

data/lib/pvcglue/templates/timezone.erb

@@ -1 +1 @@
-<%= "#{Pvcglue.cloud.timezone}\n" %>
+<%= "#{Pvcglue.cloud.timezone}\n" %>

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = "0.1.26"
+  VERSION = "0.1.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: PVC_Glue summary