pvcglue 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02bd7b82a867ccfbb8ae078a1bf1147a4c58126e
-  data.tar.gz: d21de1f2a2ea747ed8d022d768e2d48d0483b03c
+  metadata.gz: 4d8e13eb849237295d92d5608720ebac8aa8d285
+  data.tar.gz: c33ef05585ffdda58c213a6bf38bea055804ca83
 SHA512:
-  metadata.gz: 48781fc0a67f64fba00b21af49394d45843f824eac1901f809d0d401c7191332c94d9833e100d83ee3cf9c943859281f35d1eba6d278babcdbde876a0e740b5f
-  data.tar.gz: dddbb020f052676f768d962dfcb9e0e346cf386176571a17d0478ea0955fb5ce586c165232fec797c4f99393683b3a44ef4842f459973a0dcfd253261572f1dc
+  metadata.gz: 94387410ece82c63f531436d92e7616a43403a1d33d8a5cb6e3842dd8d14160718321862f3ab378e6cc510b16fd2a78712f2cee3ba72efc534ae99f74f9add78
+  data.tar.gz: 6ccf6339855e66c432a13d09084d0f3abc934f0fc55b75141b40291878f33017d8232567febb939724bd38b7a716c869379c050fa9f3e2941c6a82829aa66248

data/README.md

@@ -4,6 +4,8 @@ Pico Virtual Cloud Glue creates a tightly integrated (very small) virtual cloud
 
 An opinionated cloud application manager for Rails applications using your own servers.
 
+![pvcglue diagram](/../master/images/pvcglue.png?raw=true "PVC Glue Server Diagram")
+
 Currently supported stack:
 
   * Ubuntu 12.04 (with plans for supporting 14.04)

data/bin/pvc

@@ -9,6 +9,5 @@ if ARGV.count >= 2 && %w[local test alpha beta gamma delta preview production st
 end
 
 # puts ARGV.inspect
-
 Pvcglue::CLI.start
 puts "----- Done -----"

data/images/pvcglue.gliffy

@@ -0,0 +1 @@
+{"contentType":"application/gliffy+json","version":"1.1","metadata":{"title":"untitled","revision":0,"exportBorder":false},"embeddedResources":{"index":0,"resources":[]},"stage":{"objects":[{"x":160,"y":112.5,"rotation":0,"id":28,"uid":"com.gliffy.shape.basic.basic_v1.default.text","width":540,"height":27,"lockAspectRatio":false,"lockShape":false,"order":28,"graphic":{"type":"Text","Text":{"tid":null,"valign":"middle","overflow":"none","vposition":"none","hposition":"none","html":"<p style=\"text-align:center;\"><span style=\"font-size: 24px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 27px; color: rgb(0, 0, 0);\">Cluster</span></p>","paddingLeft":2,"paddingRight":2,"paddingBottom":2,"paddingTop":2}},"children":null,"linkMap":[]},{"x":20,"y":232.5,"rotation":0,"id":15,"uid":"com.gliffy.shape.basic.basic_v2.default.round_rectangle","width":100,"height":75,"lockAspectRatio":true,"lockShape":false,"order":11,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v2","strokeWidth":2,"strokeColor":"#3399FF","fillColor":"#FFFFFF","gradient":true,"dropShadow":false,"state":0,"shadowX":0,"shadowY":0,"opacity":1}},"children":[{"x":2,"y":0,"rotation":0,"id":17,"uid":null,"width":96,"height":28,"lockAspectRatio":false,"lockShape":false,"order":"auto","graphic":{"type":"Text","Text":{"tid":null,"valign":"middle","overflow":"none","vposition":"none","hposition":"none","html":"<p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">Manager\n</span></p><p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">(manager)</span></p>","paddingLeft":2,"paddingRight":2,"paddingBottom":2,"paddingTop":2}},"children":null}],"linkMap":[]},{"x":457,"y":270.5,"rotation":0,"id":21,"uid":"com.gliffy.shape.basic.basic_v1.default.line","width":100,"height":100,"lockAspectRatio":false,"lockShape":false,"order":16,"graphic":{"type":"Line","Line":{"strokeWidth":2,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","ortho":true,"interpolationType":"linear","cornerRadius":10,"controlPath":[[25.200274348422454,-0.5],[52.10013717421123,-0.5],[52.10013717421123,119.5],[79,119.5]],"lockSegments":{}}},"children":null,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":3,"px":1,"py":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":11,"px":0,"py":0.5}}},"linkMap":[]},{"x":453,"y":267.5,"rotation":0,"id":20,"uid":"com.gliffy.shape.basic.basic_v1.default.line","width":100,"height":100,"lockAspectRatio":false,"lockShape":false,"order":15,"graphic":{"type":"Line","Line":{"strokeWidth":2,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","ortho":true,"interpolationType":"linear","cornerRadius":10,"controlPath":[[29.200274348422454,2.5],[56.10013717421123,2.5],[56.10013717421123,-117.5],[83,-117.5]],"lockSegments":{}}},"children":null,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":3,"px":1,"py":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":9,"px":0,"py":0.5}}},"linkMap":[]},{"x":458,"y":270.5,"rotation":0,"id":19,"uid":"com.gliffy.shape.basic.basic_v1.default.line","width":100,"height":100,"lockAspectRatio":false,"lockShape":false,"order":14,"graphic":{"type":"Line","Line":{"strokeWidth":2,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","ortho":true,"interpolationType":"linear","cornerRadius":10,"controlPath":[[24.200274348422454,-0.5],[42.133516232281636,-0.5],[60.06675811614082,-0.5],[78,-0.5]],"lockSegments":{}}},"children":null,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":3,"px":1,"py":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":6,"px":0,"py":0.5}}},"linkMap":[]},{"x":279,"y":266.5,"rotation":0,"id":18,"uid":"com.gliffy.shape.basic.basic_v1.default.line","width":100,"height":100,"lockAspectRatio":false,"lockShape":false,"order":13,"graphic":{"type":"Line","Line":{"strokeWidth":2,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","ortho":true,"interpolationType":"linear","cornerRadius":10,"controlPath":[[-3,3.5],[23.666666666666686,3.5],[50.333333333333314,3.5],[77,3.5]],"lockSegments":{}}},"children":null,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":0,"px":1,"py":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":3,"px":0,"py":0.5}}},"linkMap":[]},{"x":536,"y":352.5,"rotation":0,"id":11,"uid":"com.gliffy.shape.basic.basic_v2.default.round_rectangle","width":126.20027434842248,"height":75,"lockAspectRatio":true,"lockShape":false,"order":9,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v2","strokeWidth":2,"strokeColor":"#3399FF","fillColor":"#FFFFFF","gradient":true,"dropShadow":false,"state":0,"shadowX":0,"shadowY":0,"opacity":1}},"children":[{"x":2.52400548696845,"y":0,"rotation":0,"id":14,"uid":null,"width":121.15226337448557,"height":28,"lockAspectRatio":false,"lockShape":false,"order":"auto","graphic":{"type":"Text","Text":{"tid":null,"valign":"middle","overflow":"none","vposition":"none","hposition":"none","html":"<p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">Redis [alpha]\n</span></p><p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">(redis)</span></p>","paddingLeft":2,"paddingRight":2,"paddingBottom":2,"paddingTop":2}},"children":null}],"linkMap":[]},{"x":536,"y":112.5,"rotation":0,"id":9,"uid":"com.gliffy.shape.basic.basic_v2.default.rectangle","width":126.20027434842248,"height":75,"lockAspectRatio":true,"lockShape":false,"order":7,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v2","strokeWidth":2,"strokeColor":"#3399FF","fillColor":"#FFFFFF","gradient":true,"dropShadow":false,"state":0,"shadowX":0,"shadowY":0,"opacity":1}},"children":[{"x":2.52400548696845,"y":0,"rotation":0,"id":13,"uid":null,"width":121.15226337448557,"height":28,"lockAspectRatio":false,"lockShape":false,"order":"auto","graphic":{"type":"Text","Text":{"tid":null,"valign":"middle","overflow":"none","vposition":"none","hposition":"none","html":"<p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">Memcache\n</span></p><p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">(memcached)</span></p>","paddingLeft":2,"paddingRight":2,"paddingBottom":2,"paddingTop":2}},"children":null}],"linkMap":[]},{"x":536,"y":232.5,"rotation":0,"id":6,"uid":"com.gliffy.shape.basic.basic_v2.default.round_rectangle","width":126.20027434842248,"height":75,"lockAspectRatio":true,"lockShape":false,"order":5,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v2","strokeWidth":2,"strokeColor":"#3399FF","fillColor":"#FFFFFF","gradient":true,"dropShadow":false,"state":0,"shadowX":0,"shadowY":0,"opacity":1}},"children":[{"x":2.52400548696845,"y":0,"rotation":0,"id":8,"uid":null,"width":121.15226337448557,"height":28,"lockAspectRatio":false,"lockShape":false,"order":"auto","graphic":{"type":"Text","Text":{"tid":null,"valign":"middle","overflow":"none","vposition":"none","hposition":"none","html":"<p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">PostgreSQL\n</span></p><p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">(db)</span></p>","paddingLeft":2,"paddingRight":2,"paddingBottom":2,"paddingTop":2}},"children":null}],"linkMap":[]},{"x":356,"y":232.5,"rotation":0,"id":3,"uid":"com.gliffy.shape.basic.basic_v2.default.round_rectangle","width":126.20027434842248,"height":75,"lockAspectRatio":true,"lockShape":false,"order":3,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v2","strokeWidth":2,"strokeColor":"#3399FF","fillColor":"#FFFFFF","gradient":true,"dropShadow":false,"state":0,"shadowX":0,"shadowY":0,"opacity":1}},"children":[{"x":2.52400548696845,"y":0,"rotation":0,"id":5,"uid":null,"width":121.15226337448557,"height":28,"lockAspectRatio":false,"lockShape":false,"order":"auto","graphic":{"type":"Text","Text":{"tid":null,"valign":"middle","overflow":"none","vposition":"none","hposition":"none","html":"<p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">Web Server(s)\n</span></p><p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">(web_1)</span></p>","paddingLeft":2,"paddingRight":2,"paddingBottom":2,"paddingTop":2}},"children":null}],"linkMap":[]},{"x":176,"y":232.5,"rotation":0,"id":0,"uid":"com.gliffy.shape.basic.basic_v2.default.round_rectangle","width":100,"height":75,"lockAspectRatio":true,"lockShape":false,"order":1,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v2","strokeWidth":2,"strokeColor":"#3399FF","fillColor":"#FFFFFF","gradient":true,"dropShadow":false,"state":0,"shadowX":0,"shadowY":0,"opacity":1}},"children":[{"x":2,"y":0,"rotation":0,"id":2,"uid":null,"width":96,"height":28,"lockAspectRatio":false,"lockShape":false,"order":"auto","graphic":{"type":"Text","Text":{"tid":null,"valign":"middle","overflow":"none","vposition":"none","hposition":"none","html":"<p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">Load Balancer\n</span></p><p style=\"text-align:center;\"><span style=\"font-size: 12px; font-family: Arial; white-space: pre-wrap; text-decoration: none; line-height: 14px; color: rgb(0, 0, 0);\">(lb)</span></p>","paddingLeft":2,"paddingRight":2,"paddingBottom":2,"paddingTop":2}},"children":null}],"linkMap":[]},{"x":160,"y":90,"rotation":0,"id":26,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","width":520,"height":360,"lockAspectRatio":false,"lockShape":false,"order":0,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":2,"strokeColor":"#333333","fillColor":"#FFFFFF","gradient":false,"dropShadow":false,"state":0,"shadowX":0,"shadowY":0,"opacity":1}},"children":[],"linkMap":[]}],"background":"#FFFFFF","width":700,"height":450,"maxWidth":5000,"maxHeight":5000,"nodeIndex":32,"autoFit":true,"exportBorder":false,"gridOn":true,"snapToGrid":true,"drawingGuidesOn":true,"pageBreaksOn":false,"printGridOn":false,"printPaper":"LETTER","printShrinkToFit":false,"printPortrait":true,"shapeStyles":{"com.gliffy.shape.basic.basic_v2.default":{"fill":"#FFFFFF","stroke":"#3399FF","gradient":true},"com.gliffy.shape.basic.basic_v1.default":{"fill":"#FFFFFF","stroke":"#333333","strokeWidth":2}},"lineStyles":{"global":{}},"textStyles":{},"themeData":null}}

data/lib/pvcglue/db.rb

@@ -8,15 +8,16 @@ module Pvcglue
       Pvcglue::Db.configure_database_yml
     end
 
+    method_option :fast, :type => :boolean, :aliases => "-f"
+
     desc "push", "push"
 
     def push(file_name = nil)
       raise(Thor::Error, "Stage required.") if Pvcglue.cloud.stage_name.nil?
-      pg_restore(self.class.remote, file_name)
+      pg_restore(self.class.remote, file_name, options[:fast])
     end
 
     desc "pull", "Pull copy of database from remote stage.  Pass -f to exclude tables defined in the configuration file.  If no tables are specified in the `excluded_db_tables` option, 'versions' will be used by default."
-    method_option :fast, :type => :boolean, :aliases => "-f"
 
     def pull(file_name = nil)
       raise(Thor::Error, "Stage required.") if Pvcglue.cloud.stage_name.nil?
@@ -171,7 +172,7 @@ module Pvcglue
         end
       end
 
-      def pg_restore(db, file_name)
+      def pg_restore(db, file_name, fast = false)
         Pvcglue.cloud.stage_name == 'production' && destroy_prod?
         file_name = self.class.file_helper(file_name)
 
@@ -180,10 +181,17 @@ module Pvcglue
           port = Pvcglue.cloud.port_in_context(:shell)
           user = 'deploy'
 
-          cmd = %{scp -P #{port} #{file_name} #{user}@#{host}:#{file_name}}
+          # cmd = %{scp -P #{port} #{file_name} #{user}@#{host}:#{file_name}}
+          cmd = %{rsync -avhPe "ssh -p #{port}" --progress #{file_name} #{user}@#{host}:#{file_name}}
           unless system cmd
             raise(Thor::Error, "Error:  #{$?}")
           end
+
+          unless fast
+            # Drop and recreate DB
+            Pvcglue::Packages.apply('postgresql-app-stage-db-drop'.to_sym, :build, Pvcglue.cloud.nodes_in_stage('db'))
+            Pvcglue::Packages.apply('postgresql-app-stage-conf'.to_sym, :build, Pvcglue.cloud.nodes_in_stage('db'))
+          end
         end
 
         cmd = "pg_restore --verbose --clean --no-acl --no-owner -h #{db.host} -p #{db.port}"

data/lib/pvcglue/packages/role_db.rb

@@ -38,6 +38,45 @@ package 'postgresql-app-stage-conf' do
   end
 end
 
+package 'postgresql-app-stage-db-drop' do
+  apply do
+    username = Pvcglue.cloud.stage_env['DB_USER_POSTGRES_USERNAME']
+    db_name = username # just for clarity in later statements.  This also must match database.yml.
+
+    sql = <<-SQL
+                UPDATE pg_catalog.pg_database
+                SET datallowconn=false WHERE datname='#{db_name}'
+    SQL
+    run(%Q[sudo -u postgres psql -c "#{sql}"])
+
+    # To simplify logic, try it with both versions.
+    # version >= 9.2
+    sql = <<-SQL
+                SELECT pg_terminate_backend(pg_stat_activity.pid)
+                FROM pg_stat_activity
+                WHERE pg_stat_activity.datname = '#{db_name}';
+    SQL
+    run(%Q[sudo -u postgres psql -c "#{sql}"])
+
+    # #puts "version < 9.2"
+    sql = <<-SQL
+                SELECT pg_terminate_backend(pg_stat_activity.procpid)
+                FROM pg_stat_activity
+                WHERE pg_stat_activity.datname = '#{db_name}';
+    SQL
+    run(%Q[sudo -u postgres psql -c "#{sql}"])
+
+    run(%Q[sudo -u postgres psql -c "DROP DATABASE #{db_name}"])
+
+    sql = <<-SQL
+                UPDATE pg_catalog.pg_database
+                SET datallowconn=true WHERE datname='#{db_name}'
+    SQL
+    run(%Q[sudo -u postgres psql -c "#{sql}"])
+
+  end
+end
+
 package 'postgresql-root-password' do
   apply do
     # TODO: Use this to implement setting of the root password

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = "0.1.24"
+  VERSION = "0.1.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,6 +218,8 @@ files:
 - README.md
 - Rakefile
 - bin/pvc
+- images/pvcglue.gliffy
+- images/pvcglue.png
 - lib/pvcglue.rb
 - lib/pvcglue/all_the_things.rb
 - lib/pvcglue/bootstrap.rb
@@ -298,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: PVC_Glue summary