pvcglue 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 212d9eddb6cf1cf3c75a20d6b7aa913f1bc68d6b
-  data.tar.gz: 5d74759df153a45c751d3d5cf64e0d6f1ea414a8
+  metadata.gz: bdc792eaea2d67f856dd33bf0823c6b46b984c0e
+  data.tar.gz: db46f4572b3151204063f5d9d7f30577c8cc7ed8
 SHA512:
-  metadata.gz: 6c6ce7454bf80150ac10a315314c2efdd03285a29395f1cc9c5e4523d302e26fbabc189b3519d536e754bf8e8a2b85e022dc4c98ae7191d00f28a5b8228deb0f
-  data.tar.gz: eea27fbb1d3edd84b2b4e6a566cdaa118108e82917713cc9b6c0704c734856e633fbe4d6d93d36f68475c5e4de27ee06421518f1a28dedf5babe45a57ed811c9
+  metadata.gz: 280cb61ab704549c9d4b981836046afa591ce7edcbd4ba9c40a4ee0fa7c57f999dd2b60b4a4032fed59d37d1d8a5d94ed0919ea7602a958fa82ba750b2214683
+  data.tar.gz: dc5f5edf764add9e331fd25aa4bf696c0d03d417062645e79fb887abe1bc7423c9159d4926ebee784d4ed479689d813d5168ed998e8ff07e15497b0650f879bf

data/README.md

@@ -1,14 +1,10 @@
-###
-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
+The "glue" that creates a tightly integrated (and very small) virtual cloud for your Rails applications.
 
-Pico Virtual Cloud Glue creates a tightly integrated (very small) virtual cloud for your Rails application.
+PVC Glue is an cloud application manager for Rails applications using your own (virtual) servers.
 
-An opinionated cloud application manager for Rails applications using your own servers.
+PVC Glue was developed as a professional grade replacement for Heroku (and others).
 
 ![pvcglue diagram](/../master/images/pvcglue.png?raw=true "PVC Glue Server Diagram")
 
@@ -16,25 +12,36 @@ Currently supported stack:
 
   * SSL support:  none, manual and automatic with Let's Encrypt
   * Ubuntu 16.04 LTS
-  * Provision servers automatically on Digital Ocean (and Linode)
+  * Provision servers automatically on Digital Ocean (and Linode*)
   * No need to install anything on servers first (you just need SSH access)
-  * Ruby >= 1.9 (multiple versions supported on same server)
+  * Ruby >= 1.9 (multiple versions supported on same server!)
   * Rails >= 3.2
   * RVM
   * Postgresql 9.6
   * Nginx
-  * Passenger > 5.0
-  * Memcached
-  * Redis
+  * Phusion Passenger (>= 5.x)
+  * Memcached*
+  * Redis*
+  * Designed to easily support multiple staging environments
 
 Workers:
 
-  * Delayed Job
-  * Rescue
+  * Delayed Job*
+  * Rescue*
+  
+(* Coming soon)
+
+# Quick Start
+
+##New developer starting to working a application with PVC Glue already set up
+
+For each development machine used, the "manager" must be configured once.
+
+     pvc manager configure
 
 # This is a work in progress
 
-Although this project is being used on productions sites, this should be considered "Alpha" code, as things my change without notice until version 1.0.  :)
+Although this project is being used on productions sites, this should be considered "Beta" code, as things my change without notice until version 1.0.  :)
 
 # First Time Set Up for Existing Project
 
@@ -170,12 +177,12 @@ https://github.com/radar/guides/blob/master/gem-development.md#releasing-the-gem
 Add these lines to your application's Gemfile.  `dotenv-rails` must be listed first!
 
     ################# Must be the first Gem ###################
-    gem 'dotenv-rails', "0.11.1"
+    gem 'dotenv-rails'
     ################# Must be the first Gem ###################
 
-Then add these lines to your application's Gemfile, whereever you like (usually at the end):
+Then add these lines to your application's Gemfile, wherever you like (usually at the end):
 
-    gem 'pvcglue', "~> 0.1.18", :group => :development
+    gem 'pvcglue', "~> 0.9.2", :group => :development
     gem 'pvcglue_dbutils', "~> 0.5.3"
 
 And then execute:

data/bin/pvc

@@ -5,12 +5,36 @@ 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 vmtest test alpha beta gamma delta preview production staging all].include?(ARGV[0])
-  ARGV[0], ARGV[1] = ARGV[1], "--stage=#{ARGV[0]}"
-end
 
 Pvcglue.logger.info('Starting up...')
-Pvcglue.logger.debug { ARGV.inspect }
-# puts Benchmark.measure { Pvcglue::CLI.start }
-# pvc_puts.warn("----- Done #{Benchmark.measure { Pvcglue::CLI.start }}")
-Pvcglue.logger.info("----- Done #{Benchmark.measure { Pvcglue::CLI.start }}")
+# Pvcglue.logger.info("----- Done #{Benchmark.measure { Pvcglue::CLI.start }}")
+# ap Pvcglue.instance_variables
+def capistrano_style_environment
+  Pvcglue.logger.debug { ARGV.inspect }
+  if ARGV.count >= 2
+    if %w[local vmtest test alpha beta gamma delta preview production staging].include?(ARGV[0])
+      ARGV[0], ARGV[1] = ARGV[1], "--stage=#{ARGV[0]}"
+      Pvcglue.logger.debug { ARGV.inspect }
+      Pvcglue::CLI.start
+    elsif ARGV[0] == 'all'
+      Pvcglue.logger.error('Not supported, yet.  :(')
+    elsif ARGV[0].include?(',')
+      stages = ARGV[0].split(',')
+      original_argv_1 = ARGV[1]
+      stages.each do |stage|
+        # puts "********** Stage: #{stage} **********"
+        ARGV[0] = stage
+        Pvcglue.logger.debug { ARGV.inspect }
+        # Pvcglue.reset!
+        puts `pvc #{ARGV.join(' ')}`
+        # Pvcglue::CLI.start
+      end
+    else
+      Pvcglue::CLI.start
+    end
+  end
+end
+
+Pvcglue.logger.info("----- Done #{Benchmark.measure { capistrano_style_environment }}")
+
+

data/lib/pvcglue.rb

@@ -33,6 +33,44 @@ require 'pry'
 # pvc manager bootstrap --cloud_manager_override=local_cloud.pvcglue.toml --save_before_upload=save --verbose
 
 module Pvcglue
+  # def self.reset!
+  #   ap Pvcglue.instance_variables
+  #   ap Pvcglue.class_variables
+  #
+  #   raise("Now working!")
+  #   Pvcglue.constants.select { |c| Pvcglue.const_get(c).is_a? Class }.each do |pvc_class|
+  #     pvc_class.instance_variables.each do |var|
+  #       pvc_class.remove_instance_variable(var)
+  #     end
+  #
+  #     if pvc_class.respond_to?(:class_variables)
+  #       pvc_class.class_variables.each do |var|
+  #         pvc_class.remove_class_variable(var)
+  #       end
+  #     end
+  #   end
+  #
+  #   Pvcglue::Packages.constants.select { |c| Pvcglue::Packages.const_get(c).is_a? Class }.each do |pvc_class|
+  #     pvc_class.instance_variables.each do |var|
+  #       pvc_class.remove_instance_variable(var)
+  #     end
+  #     if pvc_class.respond_to?(:class_variables)
+  #       pvc_class.class_variables.each do |var|
+  #         pvc_class.remove_class_variable(var)
+  #       end
+  #     end
+  #   end
+  #
+  #   self.instance_variables.each do |var|
+  #     # ap var.inspect
+  #     # ap self.instance_variable_get(var)
+  #     # self.instance_variable_set var, nil
+  #     self.remove_instance_variable(var)
+  #     # ap self.instance_variable_get(var)
+  #
+  #   end
+  # end
+
   mattr_accessor :command_line_options do
     {}
   end
@@ -41,14 +79,14 @@ module Pvcglue
 
     logger = Logger.new(STDOUT)
     # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
-    if ARGV.detect {|arg| arg.downcase == '--debug' || arg.downcase == '--verbose'}
-      logger.level = Logger::DEBUG 
+    if ARGV.detect { |arg| arg.downcase == '--debug' || arg.downcase == '--verbose' }
+      logger.level = Logger::DEBUG
     elsif ARGV.detect { |arg| arg.downcase == '--quiet' }
-      logger.level = Logger::WARN 
+      logger.level = Logger::WARN
     elsif ARGV.detect { |arg| arg.downcase == '--info' }
-      logger.level = Logger::INFO 
+      logger.level = Logger::INFO
     else
-      logger.level = Logger::INFO 
+      logger.level = Logger::INFO
     end
 
     logger.formatter = proc do |severity, datetime, progname, msg|

data/lib/pvcglue/cloud.rb

@@ -1,3 +1,4 @@
+# TODO:  Remove these requirements, is possible.
 require "active_support"
 require "active_support/core_ext" # for `with_indifferent_access`
 
@@ -13,6 +14,8 @@ module Pvcglue
     attr_accessor :port_in_node_context
     # attr_accessor :stage_secrets
 
+
+
     def data
       ::Pvcglue::Manager.initialize_cloud_data unless @data
       @data
@@ -332,6 +335,11 @@ module Pvcglue
       project[:gems] || {}
     end
 
+    def whenever_gem_installed?
+      data = File.read(Pvcglue.configuration.gemfile_file_name)
+      data =~ /^\s*gem\s+['"]whenever['"]/
+    end
+
     def db_rebuild
       !!stage[:db_rebuild]
     end

data/lib/pvcglue/configuration.rb

@@ -122,6 +122,7 @@ module Pvcglue
       end
 
       def find_app_name
+        # TODO:  Just use something like `rails runner 'Rails.application.class.parent'` and then cache it to a temporary file
         # try known files...anyone know a better way, without loading Rails?
         rack_up = File.join(application_dir, 'config.ru')
         app_name = underscore($1) if File.exists?(rack_up) && File.read(rack_up) =~ /^run (.*)::/
@@ -168,6 +169,10 @@ module Pvcglue
         File.join(application_dir, '.ruby-version')
       end
 
+      def gemfile_file_name
+        File.join(application_dir, 'Gemfile')
+      end
+
       def ruby_version
         File.read(ruby_version_file_name).strip
       end

data/lib/pvcglue/templates/capfile.erb

@@ -16,7 +16,8 @@ require 'capistrano/rails/assets'
 <% end %>
 
 require 'capistrano/rails/migrations'
-<% if Pvcglue.cloud.gems[:whenever] %>
+
+<% if Pvcglue.cloud.whenever_gem_installed? %>
 set :whenever_identifier, ->{ "#{fetch(:application)}_#{fetch(:stage)}" }
 require 'whenever/capistrano'
 <% end %>

data/lib/pvcglue/templates/deploy.rb.erb

@@ -2,7 +2,6 @@
 
 set :application, '<%= Pvcglue.configuration.application_name %>'
 set :repo_url, '<%= Pvcglue.cloud.repo_url %>'
-set :tmp_dir, '/tmp/<%= Pvcglue.cloud.app_and_stage_name %>'
 
 set :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }
 

data/lib/pvcglue/templates/stage-deploy.rb.erb

@@ -1,5 +1,6 @@
 # This is a generated file.  Do not modify...or else!  :)
 
+set :tmp_dir, '/tmp/ <%= Pvcglue.cloud.app_and_stage_name %> '
 set :stage, :<%= Pvcglue.cloud.stage_name %>
 set :rails_env, :<%= Pvcglue.cloud.stage_name %> # workaround for RAILS_ENV= being blank in delayed job tasks
 set :deploy_to, '<%= Pvcglue.cloud.deploy_to_app_dir %>'

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - T. Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler