pvcglue 0.1.39 → 0.9.0

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

@@ -10,8 +10,8 @@ set :delayed_job_args, "<%= Pvcglue.cloud.delayed_job_args %>"
 <% end %>
 set :ssh_options, {port: <%= Pvcglue.cloud.port_in_context(:deploy) %>}
 
-<% Pvcglue.cloud.nodes_in_stage('web').each do |node, node_config| %>
-server '<%= node_config[:public_ip] %>', roles: %w{web app db}, user: 'deploy' # server: <%= node.to_s %>
+<% Pvcglue.cloud.minions_filtered('web').each do |minion_name, minion| %>
+server '<%= minion.public_ip %>', roles: %w{web app db}, user: '<%= minion.remote_user_name %>' # server:  <%= minion_name.to_s %>
 <% end %>
 <% if Pvcglue.cloud.db_rebuild %>
 

data/lib/pvcglue/templates/web.bashrc.erb

@@ -10,7 +10,10 @@ fi
 # for examples
 
 # If not running interactively, don't do anything
-[ -z "$PS1" ] && return
+case $- in
+    *i*) ;;
+      *) return;;
+esac
 
 # don't put duplicate lines or lines starting with space in the history.
 # See bash(1) for more options
@@ -35,13 +38,13 @@ shopt -s checkwinsize
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
 # set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
     debian_chroot=$(cat /etc/debian_chroot)
 fi
 
 # set a fancy prompt (non-color, unless we know we "want" color)
 case "$TERM" in
-    xterm-color) color_prompt=yes;;
+    xterm-color|*-256color) color_prompt=yes;;
 esac
 
 # uncomment for a colored prompt, if the terminal has the capability; turned
@@ -88,6 +91,9 @@ if [ -x /usr/bin/dircolors ]; then
     alias egrep='egrep --color=auto'
 fi
 
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
 # some more ls aliases
 alias ll='ls -alF'
 alias la='ls -A'
@@ -109,12 +115,17 @@ fi
 # enable programmable completion features (you don't need to enable
 # this, if it's already enabled in /etc/bash.bashrc and /etc/profile
 # sources /etc/bash.bashrc).
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
     . /etc/bash_completion
 fi
 
 # Best practice dictates that this should be moved to .bash_profile
 # http://askubuntu.com/questions/121073/why-bash-profile-is-not-getting-sourced-when-opening-a-terminal
 # but this works ok for now, it just has to be in two places.  It should be done at the end of this file.
-PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+
+fi

data/lib/pvcglue/templates/web.nginx.conf.erb

@@ -78,7 +78,7 @@ http {
       return      444;
   }
 
-<% Pvcglue.cloud.web_nginx_http.each do |option| %>
+<% (minion.web_nginx_http || []).each do |option| %>
   <%= "  #{option};\n" %>
 <% end %>
 

data/lib/pvcglue/templates/web.sites-enabled.erb

@@ -8,7 +8,7 @@ server {
 
 # Custom options from web_nginx_server
 
-<% Pvcglue.cloud.web_nginx_server.each do |option| %>
+<% (minion.web_nginx_server || []).each do |option| %>
   <%= "  #{option};\n" %>
 <% end %>
 

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = "0.1.39"
+  VERSION = '0.9.0'
 end

data/pvcglue.gemspec

@@ -4,30 +4,35 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pvcglue/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "pvcglue"
+  spec.name          = 'pvcglue'
   spec.version       = Pvcglue::VERSION
-  spec.authors       = ["Andrew Lyric"]
-  spec.email         = ["talyric@gmail.com"]
+  spec.authors       = ['T. Andrew Lyric']
+  spec.email         = ['talyric@gmail.com']
   spec.description   = %q{PVC_Glue description}
   spec.summary       = %q{PVC_Glue summary}
-  spec.homepage      = "https://github.com/talyric/pvcglue"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/talyric/pvcglue'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", '>= 1.3.0', '< 2.0'
-  spec.add_development_dependency "rake", '~> 10.1'
+  spec.add_development_dependency 'bundler', '>= 1.3.0', '< 2.0'
+  spec.add_development_dependency 'rake', '~> 10.1'
 
-  spec.add_dependency "thor", '~> 0.19', '>= 0.19.1'
-  spec.add_dependency "toml-rb", '~> 0.1', '>= 0.1.6'
-  spec.add_dependency "orca", '= 0.4', '= 0.4.0'
+  spec.add_dependency 'thor', '~> 0.19', '>= 0.19.1'
+  spec.add_dependency 'toml-rb', '~> 0.3', '>= 0.3.15'
+  spec.add_dependency 'orca', '= 0.4', '= 0.4.0'
   spec.add_dependency 'capistrano', '~> 3.4.0', '>= 3.4.1'
   spec.add_dependency 'capistrano-bundler', '~> 1.1', '>= 1.1.1'
   spec.add_dependency 'capistrano-rails', '~> 1.1', '>= 1.1.1'
   spec.add_dependency 'capistrano-rvm', '~> 0.1', '>= 0.1.1'
-  spec.add_dependency "sshkit", '~> 1.3', '>= 1.3.0'
+  spec.add_dependency 'sshkit', '~> 1.3', '>= 1.3.0'
+  spec.add_dependency 'awesome_print'
+  spec.add_dependency 'hashie'
+  spec.add_dependency 'droplet_kit'
+  spec.add_dependency 'paint'
+  spec.add_dependency 'pry'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.9.0
 platform: ruby
 authors:
-- Andrew Lyric
+- T. Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,20 +70,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.3.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.3.15
 - !ruby/object:Gem::Dependency
   name: orca
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: droplet_kit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: PVC_Glue description
 email:
 - talyric@gmail.com
@@ -213,6 +283,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -227,36 +299,66 @@ files:
 - lib/pvcglue/cli.rb
 - lib/pvcglue/cloud.rb
 - lib/pvcglue/configuration.rb
+- lib/pvcglue/connection.rb
+- lib/pvcglue/custom_hashie.rb
 - lib/pvcglue/db.rb
 - lib/pvcglue/deploy.rb
+- lib/pvcglue/digital_ocean.rb
 - lib/pvcglue/env.rb
 - lib/pvcglue/local.rb
 - lib/pvcglue/manager.rb
+- lib/pvcglue/minion.rb
 - lib/pvcglue/monit.rb
 - lib/pvcglue/nodes.rb
+- lib/pvcglue/old_packages/bootstrap.rb
+- lib/pvcglue/old_packages/env.rb
+- lib/pvcglue/old_packages/firewall.rb
+- lib/pvcglue/old_packages/manager.rb
+- lib/pvcglue/old_packages/monit-bootstrap.rb
+- lib/pvcglue/old_packages/monit-web.rb
+- lib/pvcglue/old_packages/nginx.rb
+- lib/pvcglue/old_packages/nodejs.rb
+- lib/pvcglue/old_packages/passenger.rb
+- lib/pvcglue/old_packages/postgresql.rb
+- lib/pvcglue/old_packages/role_db.rb
+- lib/pvcglue/old_packages/role_lb.rb
+- lib/pvcglue/old_packages/role_memcached.rb
+- lib/pvcglue/old_packages/role_redis.rb
+- lib/pvcglue/old_packages/role_web.rb
+- lib/pvcglue/old_packages/rvm.rb
+- lib/pvcglue/old_packages/timezone.rb
+- lib/pvcglue/old_packages/ubuntu.rb
 - lib/pvcglue/packages.rb
-- lib/pvcglue/packages/bootstrap.rb
-- lib/pvcglue/packages/env.rb
+- lib/pvcglue/packages/apt.rb
+- lib/pvcglue/packages/apt_repos.rb
+- lib/pvcglue/packages/apt_update.rb
+- lib/pvcglue/packages/apt_upgrade.rb
+- lib/pvcglue/packages/authorized_keys.rb
+- lib/pvcglue/packages/bundler.rb
+- lib/pvcglue/packages/dir_base.rb
+- lib/pvcglue/packages/dir_shared.rb
 - lib/pvcglue/packages/firewall.rb
+- lib/pvcglue/packages/load_balancer.rb
+- lib/pvcglue/packages/maintenance_mode.rb
 - lib/pvcglue/packages/manager.rb
-- lib/pvcglue/packages/monit-bootstrap.rb
-- lib/pvcglue/packages/monit-web.rb
-- lib/pvcglue/packages/nginx.rb
-- lib/pvcglue/packages/nodejs.rb
-- lib/pvcglue/packages/passenger.rb
 - lib/pvcglue/packages/postgresql.rb
-- lib/pvcglue/packages/role_db.rb
-- lib/pvcglue/packages/role_lb.rb
-- lib/pvcglue/packages/role_memcached.rb
-- lib/pvcglue/packages/role_redis.rb
-- lib/pvcglue/packages/role_web.rb
+- lib/pvcglue/packages/roles.rb
+- lib/pvcglue/packages/ruby.rb
 - lib/pvcglue/packages/rvm.rb
-- lib/pvcglue/packages/timezone.rb
-- lib/pvcglue/packages/ubuntu.rb
+- lib/pvcglue/packages/secrets.rb
+- lib/pvcglue/packages/ssh_key_check.rb
+- lib/pvcglue/packages/ssl.rb
+- lib/pvcglue/packages/ssl_acme.rb
+- lib/pvcglue/packages/swap.rb
+- lib/pvcglue/packages/unattended_upgrades.rb
+- lib/pvcglue/packages/users.rb
+- lib/pvcglue/packages/web.rb
 - lib/pvcglue/pvcify.rb
 - lib/pvcglue/railtie.rb
 - lib/pvcglue/ssl.rb
+- lib/pvcglue/stack.rb
 - lib/pvcglue/templates/20auto-upgrades.erb
+- lib/pvcglue/templates/50unattended-upgrades.erb
 - lib/pvcglue/templates/authorized_keys.erb
 - lib/pvcglue/templates/capfile.erb
 - lib/pvcglue/templates/database.yml.erb
@@ -266,6 +368,7 @@ files:
 - lib/pvcglue/templates/hosts.erb
 - lib/pvcglue/templates/lb.nginx.conf.erb
 - lib/pvcglue/templates/lb.sites-enabled.erb
+- lib/pvcglue/templates/letsencrypt-webroot.erb
 - lib/pvcglue/templates/maintenance_mode.erb
 - lib/pvcglue/templates/memcached.conf.erb
 - lib/pvcglue/templates/monit.app.monitrc.erb
@@ -309,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: PVC_Glue summary