pvcglue 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c0c298368758b219ada1c59b9295cb38e27c787
-  data.tar.gz: 379a85589243740d2c758fe7494746095376023a
+  metadata.gz: 4a6c0ef624ca94138937f355221bbe98d2b54309
+  data.tar.gz: 4193b2afe622eaf248cf41f4f2fb1d71ae6d843d
 SHA512:
-  metadata.gz: 2c6cd78e75c63ef6068100e38b358ab4c292ba79db7a5e53ac5ffe4fd39ac470e643801d6b7484b945c86b88188a8b7e98786c0fc58336670ca13af5bbe7504e
-  data.tar.gz: f936147aec4e862349af6cedd195e234ca451ef4a7c60b430b634ead48905614a3fbe75afecf1c5964bbe9894eff85453a338436d36743d8553a31d90516120a
+  metadata.gz: bb8a10bac1e85700535c763c34a47253e03107a069c73195ab4cf36efa70de5141d02b71e01a9c399b150e4424c01594495ba82f938a702d02971f36f7d1b8ea
+  data.tar.gz: e2e8c419ecdcf7dc6dd848c195d63ce41dcfd96e77b63ffb424c5f77da1b6e31bed9d1d6ed636bec62913cdc5bc762b33778363df0bb4d05921b49f9e46cb2f2

data/lib/pvcglue.rb

@@ -28,6 +28,8 @@ module Pvcglue
   end
 
   def self.render_template(template, file_name = nil)
+    puts '-'*80
+    puts "---> render_template(template=#{template}, file_name=#{file_name}"
     data = Tilt.new(Pvcglue.template_file_name(template)).render
     if file_name
       File.write(file_name, data)

data/lib/pvcglue/cli.rb

@@ -181,6 +181,13 @@ module Pvcglue
       Pvcglue::Local.start
     end
 
+    desc "up", "start; bootstrap; pvcify; build; deploy"
+    method_option :stage, :required => true, :aliases => "-s"
+
+    def up
+      Pvcglue::Local.up
+    end
+
     desc "stop", "shut down local virtual machines"
     method_option :stage, :required => true, :aliases => "-s"
 

data/lib/pvcglue/local.rb

@@ -14,6 +14,21 @@ module Pvcglue
       Bundler.with_clean_env { `vagrant --version` } =~ /Vagrant \d+\.\d+\.\d+/
     end
 
+    def self.system_live_out(cmd)
+      raise($?) unless system(cmd, out: $stdout, err: :out)
+    end
+
+    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')
+    end
+
     def self.start
       FileUtils.rm_rf(local_cache_dir)
 
@@ -36,7 +51,7 @@ module Pvcglue
       update_local_config(machines)
     end
 
-    def self.get_user_ip_address
+    def self.get_machine_ip_address
       result = `ip route get 8.8.8.8 2>&1 | awk '{print $NF; exit}'`.strip # Ubuntu
       result = `ipconfig getifaddr en0 2>&1` unless result =~ /\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/ # OSX
       raise "IP Address not found" unless result =~ /\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/
@@ -53,7 +68,7 @@ module Pvcglue
       # puts data.inspect
       # puts machines.inspect
       # puts machines[:manager][:public_ip].inspect
-      manager_ip = machines[:manager][:public_ip].to_s # to_s in case it's nil
+      manager_ip = machines[:manager][:public_ip].to_s # to_s in case it's nil, as 'nil' is invalid TOML
       raise(Thor::Error, "Manager IP is not valid. :(") unless manager_ip =~ /\b(?:\d{1,3}\.){3}\d{1,3}\b/
       data["local_cloud_manager"] = manager_ip
       # data["#{Pvcglue.cloud.stage_name}_cloud_manager"] = manager_ip
@@ -64,6 +79,8 @@ module Pvcglue
       data = TOML.load_file(::Pvcglue.cloud.local_file_name) if File.exists?(::Pvcglue.cloud.local_file_name)
       data = TOML.load_file(Pvcglue.configuration.cloud_cache_file_name) if data.empty? && File.exists?(Pvcglue.configuration.cloud_cache_file_name)
       # TODO:  get repo_url from git, if possible
+      puts "*"*80
+      puts data.inspect
       if data.empty?
         data = {app_name =>
                     {"excluded_db_tables" => ["versions"],
@@ -73,7 +90,7 @@ module Pvcglue
                      "swapfile_size" => 128,
                      "time_zone" => "America/Los_Angeles",
                      "authorized_keys" => {"example" => File.read(File.expand_path('~/.ssh/id_rsa.pub'))}, # TODO: error checking
-                     "dev_ip_addresses" => {"local" => "127.0.0.1", "user" => get_user_ip_address},
+                     "dev_ip_addresses" => {"local" => "127.0.0.1", "user" => get_machine_ip_address},
                      "gems" => {"delayed_job" => false, "whenever" => false},
                      "stages" =>
                          {"local" =>
@@ -130,27 +147,31 @@ module Pvcglue
       # puts data[app_name][:stages][:local][:roles][:caching][:memcached][:public_ip].inspect
       # puts "*"*80
       stage_name = Pvcglue.cloud.stage_name
+      # stage_name = :local
       # data[app_name][:stages][stage_name][:roles][:caching][:memcached][:public_ip] = machines[:memcached][:public_ip]
       # data[app_name][:stages][stage_name][:roles][:caching][:memcached][:private_ip] = machines[:memcached][:private_ip]
-      data[app_name][:stages][stage_name][:roles][:db][:db][:public_ip] = machines[:db][:public_ip]
-      data[app_name][:stages][stage_name][:roles][:db][:db][:private_ip] = machines[:db][:private_ip]
-      data[app_name][:stages][stage_name][:roles][:redis][:redis][:public_ip] = machines[:db][:public_ip]
-      data[app_name][:stages][stage_name][:roles][:redis][:redis][:private_ip] = machines[:db][:private_ip]
-      data[app_name][:stages][stage_name][:roles][:lb][:lb][:public_ip] = machines[:lb][:public_ip]
-      data[app_name][:stages][stage_name][:roles][:lb][:lb][:private_ip] = machines[:lb][:private_ip]
-      data[app_name][:stages][stage_name][:roles][:web][:web_1][:public_ip] = machines[:web][:public_ip]
-      data[app_name][:stages][stage_name][:roles][:web][:web_1][:private_ip] = machines[:web][:private_ip]
-
-      data[app_name][:dev_ip_addresses] = {"local" => "127.0.0.1", "user" => get_user_ip_address}
-      data[app_name][:stages][stage_name][:domains] = [machines[:lb][:public_ip]]
+      data[app_name][:stages][stage_name][:roles][:db][:db][:public_ip] = machines[:db][:public_ip].to_s # to_s in case it's nil, as 'nil' is invalid TOML
+      data[app_name][:stages][stage_name][:roles][:db][:db][:private_ip] = machines[:db][:private_ip].to_s # to_s in case it's nil, as 'nil' is invalid TOML
+      data[app_name][:stages][stage_name][:roles][:redis][:redis][:public_ip] = machines[:db][:public_ip].to_s # to_s in case it's nil, as 'nil' is invalid TOML
+      data[app_name][:stages][stage_name][:roles][:redis][:redis][:private_ip] = machines[:db][:private_ip].to_s # to_s in case it's nil, as 'nil' is invalid TOML
+      data[app_name][:stages][stage_name][:roles][:lb][:lb][:public_ip] = machines[:lb][:public_ip].to_s # to_s in case it's nil, as 'nil' is invalid TOML
+      data[app_name][:stages][stage_name][:roles][:lb][:lb][:private_ip] = machines[:lb][:private_ip].to_s # to_s in case it's nil, as 'nil' is invalid TOML
+      data[app_name][:stages][stage_name][:roles][:web][:web_1][:public_ip] = machines[:web][:public_ip].to_s # to_s in case it's nil, as 'nil' is invalid TOML
+      data[app_name][:stages][stage_name][:roles][:web][:web_1][:private_ip] = machines[:web][:private_ip].to_s # to_s in case it's nil, as 'nil' is invalid TOML
+
+      # puts "*"*80
+      # puts machines.inspect
+      data[app_name][:dev_ip_addresses] = {"local" => "127.0.0.1", "user" => get_machine_ip_address.to_s} # to_s in case it's nil, as 'nil' is invalid TOML
+      # data[app_name][:stages][stage_name][:domains] = [[machines[:lb][:public_ip]].to_s] # to_s in case it's nil, as 'nil' is invalid TOML
+      data[app_name][:stages][stage_name][:domains] = [machines[:lb][:public_ip] || ''] # to_s in case it's nil, as 'nil' is invalid TOML
 
       # data[app_name][:stages][:local][:roles][:web][:web_2][:public_ip] = machines[:web_2][:public_ip]
       # data[app_name][:stages][:local][:roles][:web][:web_2][:private_ip] = machines[:web_2][:private_ip]
 
-          Pvcglue.cloud.data = data
-      File.write(::Pvcglue.cloud.local_file_name, TOML.dump(Pvcglue.cloud.data))
+      Pvcglue.cloud.data = data
+      File.write(::Pvcglue.cloud.local_file_name, TOML::PvcDumper.new(Pvcglue.cloud.data).toml_str)
       File.write(Pvcglue.configuration.cloud_cache_file_name, TOML::PvcDumper.new(Pvcglue.cloud.data).toml_str)
-      puts TOML::PvcDumper.new(Pvcglue.cloud.data).toml_str
+      # puts TOML::PvcDumper.new(Pvcglue.cloud.data).toml_str
     end
 
     def self.stop
@@ -230,6 +251,8 @@ module Pvcglue
         data.scan(/inet (.*)\/.*global (eth0)/) do |ip, eth|
           vagrant_ips << ip
         end
+        raise "Public IP not found" unless machines[machine][:public_ip]
+        raise "Private IP not found" unless machines[machine][:private_ip]
         puts "Adding you public key to the root user for #{machine_name}..."
         # cat ~/.ssh/id_rsa.pub | vagrant ssh manager -c 'sudo tee /root/.ssh/authorized_keys'
         raise $? unless system %Q(cat ~/.ssh/id_rsa.pub | vagrant ssh #{machine_name} -c 'sudo tee /root/.ssh/authorized_keys')
@@ -238,6 +261,7 @@ module Pvcglue
       File.write(machine_cache_file_name, machines.to_json)
       FileUtils.mkdir_p(File.dirname(vagrant_config_cache_file_name)) # the 'tmp' directory may not always exist
       File.write(vagrant_config_cache_file_name, vagrant_ips.to_json)
+      # puts machines.inspect
       machines
     end
 

data/lib/pvcglue/packages/manager.rb

@@ -4,7 +4,7 @@ apt_package 'ufw'
 
 package 'bootstrap-manager' do
   # TODO: firewall and ssh port config
-  #depends_on 'time-zone'
+  depends_on 'authenticate-host'
   depends_on 'htop'
   # depends_on 'ufw'
   #depends_on 'deploy-user'
@@ -14,6 +14,12 @@ package 'bootstrap-manager' do
   depends_on 'manager-copy-id'
 end
 
+package 'authenticate-host' do
+  apply do
+    sudo "ls" # side-effect will add host to known_hosts
+  end
+end
+
 package 'pvcglue-user' do
   apply do
     # Local variables used to improve readability of bash commands :)
@@ -55,7 +61,7 @@ package 'manager-copy-id' do
   apply do
     authorized_keys_file_name = Pvcglue::Manager.authorized_keys_file_name
     user_name = Pvcglue::Manager.user_name
-    copy_id = %Q[cat ~/.ssh/id_rsa.pub | ssh #{node.get(:user)}@#{node.host} "cat >> #{authorized_keys_file_name}"]
+    copy_id = %Q[cat ~/.ssh/id_rsa.pub | ssh -o BatchMode=yes -o StrictHostKeyChecking=no #{node.get(:user)}@#{node.host} "cat >> #{authorized_keys_file_name}"]
     system "#{copy_id}"
     run(%Q[cat "" >> #{authorized_keys_file_name}])
     sudo "chown #{user_name}:#{user_name} #{authorized_keys_file_name} && chmod 600 #{authorized_keys_file_name}"

data/lib/pvcglue/packages/rvm.rb

@@ -8,7 +8,7 @@ package 'rvm' do
 
   apply do
     run 'gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3'
-    run '\curl -sSL https://get.rvm.io | bash -s stable'
+    run '\curl -sSL https://get.rvm.io | bash -s stable --with-default-gems="bundler"'
     run "rvm requirements"
   end
 

data/lib/pvcglue/templates/capfile.erb

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

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -298,7 +298,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