pvcglue 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjBjYjE4YzY4NTA4NDc2YTNlODBhNjVlZDc3Yjc3NWIzMjU3YjA1MA==
+    MzZlZDE3ZjViMWE0NzUwNTMwNGU3NWZjODE2ZDQyZjA5MTkwM2E1NA==
   data.tar.gz: !binary |-
-    MjE5YWFlZTdhZmJjZDg0NTM0YmUyZDQyYjA4Nzg3YTFjYzAwZDg0Yw==
+    MzFjY2E0YTMyMzU3YzQ1NWZlNWU3ZmUyZjNjOTc2MTg3YzY4Yzc0Yg==
 SHA512:
   metadata.gz: !binary |-
-    Y2Y5Mjc2NmM0ZTk1YWNkYTY4ZGRiZTZlYTg2N2UzYmE0NjdjMGVmMGViMDJl
-    YmRmZGJhZjkyMGNmN2VjNTg2NjBiZGIzYTg1OGIxNzBiN2EyN2UxMTg2YmEw
-    MjVjNmQ1ZmM0N2MxNzAyOTBhZGRkMTlkNDNiNGFmMDBkOTAxYjQ=
+    MWFkYmU3NDlmNjRjODY3MWQyZDNkM2Y3YzYwNmY4MGZjMzcwOTRkYjNiMDFk
+    MTA4ZjUxZDhkYWViNjcwZTY3OTIzN2I1YjhjMzY4NGEyOWU5NmNlOTc0YmE4
+    MzlkOWEzMGZiNjA5ZTVmZWFlYjYwY2IwNDNlYzc1NGNhNTMwMzY=
   data.tar.gz: !binary |-
-    ZWNiNTA4NjE2NjczNDEwNTM2MjMwZWI4YTI3ZGE0MTBhMTVjOTFhM2NlMzE4
-    YzExNmZkZWM1ZjAyZGM3MDdhNjE0YWEwY2JjMDhmNDU0YzlmZTUwN2ZhN2Iz
-    ZWJjMzQ3NDA0ZDhkOTcyMmJlZWViZTRkMTUwN2VkOWEzNzI4M2U=
+    MjM3NDQ2MmZmMTM2NGExODQzYWE0MzIwOWJkNTYzZDlhMjQzOTRmZWQ1NjIz
+    MzJlMzEzZmFjY2Q4NDFmZWE0NWY3NjVlYjRmZTZhNTRjMTkyYWMxOTE4YmRl
+    NTMyMWViNDRiOTMxNzZhNzYxYTU0NzBjYWM1NjNjNzY3ODBhYjM=

data/README.md

@@ -37,14 +37,9 @@ https://github.com/radar/guides/blob/master/gem-development.md
 
 Add this line to your application's Gemfile:
 
-    group :development do
-      gem 'pvcglue', "~> 0.1.0", :github => 'talyric/pvcglue', :branch => 'master', :require => false
+    gem 'pvcglue', "~> 0.1.7", :group => :development
+    gem 'pvcglue_dbutils', "~> 0.5.3"
 
-      # This should be used once gem is 'official' :)
-      #gem 'pvcglue'
-    end
-
-    gem 'pvcglue_dbutils', "~> 0.5.1", :github => 'talyric/pvcglue_dbutils', :branch => 'master' # must be available in all environments
 
 And then execute:
 
@@ -58,6 +53,21 @@ Or install it yourself as:
 
 TODO: Write usage instructions here
 
+## Developing
+
+To use locally committed gem, use
+
+    bundle config local.pvcglue ~/projects/pvcglue
+
+and
+
+    bundle config --delete local.pvcglue
+
+to restore using remote repo.  See http://ryanbigg.com/2013/08/bundler-local-paths/ and http://bundler.io/v1.3/bundle_config.html
+
+    gem 'pvcglue', "~> 0.1.5", :github => 'talyric/pvcglue', :branch => 'master', :group => :development
+    gem 'pvcglue_dbutils', "~> 0.5.2", :github => 'talyric/pvcglue_dbutils', :branch => 'master' # must be available in all environments
+
 ## Contributing
 
 1. Fork it

data/bin/pvc

@@ -10,4 +10,5 @@ end
 
 # puts ARGV.inspect
 
-Pvcglue::CLI.start
+Pvcglue::CLI.start
+puts "Done."

data/lib/pvcglue/cli.rb

@@ -111,6 +111,23 @@ module Pvcglue
       maintenance(mode)
     end
 
+    desc "bypass", "enable or disable maintenance mode bypass for developers"
+    method_option :stage, :required => true, :aliases => "-s"
+
+    def bypass(mode)
+      raise(Thor::Error, "invalid maintenance bypass mode :(  (Hint:  try on or off.)") unless mode.in?(%w(on off))
+      Pvcglue.cloud.bypass_mode = mode
+      Pvcglue::Packages.apply(:bypass_mode, :maintenance, Pvcglue.cloud.nodes_in_stage('lb'))
+    end
+
+    desc "b", "enable or disable maintenance mode bypass for developers"
+    method_option :stage, :required => true, :aliases => "-s"
+
+    def b(mode)
+      bypass(mode)
+    end
+
+
     desc "sh", "run interactive shell on node"
     method_option :stage, :required => true, :aliases => "-s"
 

data/lib/pvcglue/cloud.rb

@@ -7,6 +7,7 @@ module Pvcglue
     attr_accessor :current_node
     attr_accessor :current_hostname
     attr_accessor :maintenance_mode
+    attr_accessor :bypass_mode
     attr_accessor :stage_env
     attr_accessor :passenger_ruby
     attr_accessor :port_in_node_context
@@ -134,6 +135,10 @@ module Pvcglue
       File.join(maintenance_files_dir, 'maintenance.on')
     end
 
+    def maintenance_bypass_mode_file_name
+      File.join(maintenance_files_dir, 'maintenance_bypass.off')
+    end
+
     def deploy_to_app_current_temp_dir
       File.join(deploy_to_app_current_dir, 'tmp')
     end
@@ -250,7 +255,7 @@ module Pvcglue
       case context
         when :bootstrap, :manager
           port = "22"
-        when :env, :build, :shell, :deploy
+        when :env, :build, :shell, :deploy, :maintenance
           port = data[app_name][:ssh_allowed_from_all_port] || "22"
         else
           raise "Context not specified or invalid"

data/lib/pvcglue/packages/role_lb.rb

@@ -52,6 +52,16 @@ package 'maintenance_mode' do
   end
 end
 
+package 'bypass_mode' do
+  apply do
+    if Pvcglue.cloud.bypass_mode == 'off'
+      run "touch #{Pvcglue.cloud.maintenance_bypass_mode_file_name}"
+    else
+      run "rm #{Pvcglue.cloud.maintenance_bypass_mode_file_name}"
+    end
+  end
+end
+
 package 'ssl-cert' do
   apply do
     if Pvcglue.cloud.ssl_mode == :load_balancer_force_ssl

data/lib/pvcglue/templates/maintenance_mode.erb

@@ -4,21 +4,32 @@
 
   set $maintenance off;
   set $maintenance_bypass off;
+
   # https://blog.ed.gs/2013/01/25/nginx-multiple-if-statements/
-  set $bypass_test no;
+  set $maintenance_test maint_off;
+  set $bypass_test bypass_on;
+  set $ip_test ip_unmatched;
+  set $all_tests no;
 
   if (-f $document_root/maintenance/maintenance.on) {
+    set $maintenance_test maint_on;
     set $maintenance on;
-    set $bypass_test yes;
+  }
+
+  if (-f $document_root/maintenance/maintenance_bypass.off) {
+    set $bypass_test bypass_off;
   }
 
   if ($remote_addr ~ <%= Pvcglue.cloud.dev_ip_addresses.join('|').gsub('.', '\.') %>) {
-    set $maintenance off;
-    set $bypass_test "${bypass_test}yes";
+    set $ip_test ip_match;
   }
 
-  if ($bypass_test = yesyes) {
-    set $maintenance_bypass on; # only add header when maintenance is on and the remote address is a dev ip address
+  set $all_tests "${maintenance_test}__${bypass_test}__${ip_test}";
+
+
+  if ($all_tests = maint_on__bypass_on__ip_match) {
+    set $maintenance off;
+    set $maintenance_bypass on; # only add header when maintenance is on and the remote address is a dev ip address and bypass is on
   }
 
   if ($uri ~ ^/maintenance/.*) {

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler