toquen 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca13918dad0a5c479f96226a3b2116c1c0b6e45
-  data.tar.gz: 2ecdb62f08e7fc998f7482644f882f66bb83cf14
+  metadata.gz: 35d32944eef7c02af70094f31f5da6a672e4d091
+  data.tar.gz: d219dafe818f1afa110e74383303f2479157dcfa
 SHA512:
-  metadata.gz: 1fa11598ba5b0cb50fc71de58a4193e7be386843d54b69d0f3d492441ef65742d5843449d984440e39e9e289eca5bf4e333a1568891595646b6940581a0bd95f
-  data.tar.gz: 8dbf89de55e378cbd02689e0457d50c6c9b7cabddf4a42c634692c84d703210354cebd20a84fc9c506f2cc069e8c61809f4bb4c50ba004602976b61edf233fc0
+  metadata.gz: f13cf4def2069f625870c1032ae9cdef9eac497a9c858bbc46ed366e437a9e3c25c79c90402df3d72a3235c31ce9bc06d21cd22673d495fe6a2d9a60ed337f57
+  data.tar.gz: 3ab5bdd3f71451190c873db442a74c7c281ced839ae3fa6908f0155e6dc6d16f7bad7d63f498865ffe5f44e10b72348f90b2a938b782562eae59d6e16c9b4f73

data/lib/toquen/capistrano.rb

@@ -50,23 +50,28 @@ end
 
 desc "send up apps.json config file"
 task :update_appconfig do
-  return unless File.exists?('config/apps.json')
-  apps = JSON.parse(File.read('config/apps.json'))
-  config = { "_description" => "Dropped off by Toquen/Chef.", "servers" => [] }.merge(apps['default'] || {})
-  Dir.glob("#{fetch(:chef_data_bags_path)}/servers/*.json") do |fname|
-    open(fname, 'r') { |f| config['servers'] << JSON.parse(f.read) }
-  end
-  dest = File.join fetch(:apps_config_path, "/home/#{fetch(:ssh_options)[:user]}"), "apps.json"
+  if File.exists?('config/apps.json')
+    apps = JSON.parse(File.read('config/apps.json'))
+    config = { "_description" => "Dropped off by Toquen/Chef.", "servers" => [] }.merge(apps['default'] || {})
+    Dir.glob("#{fetch(:chef_data_bags_path)}/servers/*.json") do |fname|
+      open(fname, 'r') { |f| config['servers'] << JSON.parse(f.read) }
+    end
+    dest = File.join fetch(:apps_config_path, "/home/#{fetch(:ssh_options)[:user]}"), "apps.json"
 
-  on roles(:all), in: :parallel do |host|
-    appconfig = Marshal.load(Marshal.dump(config))
-    host.properties.roles.each do |role|
-      appconfig.merge!(apps[role.to_s] || {})
+    on roles(:all), in: :parallel do |host|
+      appconfig = Marshal.load(Marshal.dump(config))
+      host.properties.roles.each do |role|
+        appconfig.merge!(apps[role.to_s] || {})
+      end
+      debug "Uploading app config file to #{dest}"
+      upload! StringIO.new(JSON.pretty_generate(appconfig)), "/tmp/apps.json"
+      sudo "mv /tmp/apps.json #{dest}"
+      sudo "chmod 755 #{dest}"
     end
-    debug "Uploading app config file to #{dest}"
-    upload! StringIO.new(JSON.pretty_generate(appconfig)), "/tmp/apps.json"
-    sudo "mv /tmp/apps.json #{dest}"
-    sudo "chmod 755 #{dest}"
+  else
+    run_locally {
+      error "No config/apps.json file found."
+    }
   end
 end
 

data/lib/toquen/version.rb

@@ -1,3 +1,3 @@
 module Toquen
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/toquen.gemspec

@@ -9,15 +9,16 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Brian Muller"]
   gem.email         = ["bamuller@gmail.com"]
   gem.description   = "Toquen: Capistrano + AWS + Chef-Solo"
-  gem.summary       = "Toquen: Capistrano + AWS + Chef-Solo"
+  gem.summary       = "Toquen: Joins Capistrano + AWS + Chef-Solo into small devops ease"
   gem.homepage      = "https://github.com/bmuller/toquen"
-
+  gem.licenses      = ['MIT']
+  
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_dependency('capistrano', '>= 3.0.1')
-  gem.add_dependency('aws-sdk')
+  gem.add_dependency('aws-sdk', '~> 1')
   gem.add_dependency('terminal-table')
   gem.add_dependency('term-ansicolor')
   gem.add_development_dependency("rdoc")

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: toquen
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Brian Muller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   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: term-ansicolor
   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: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 'Toquen: Capistrano + AWS + Chef-Solo'
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -104,7 +104,8 @@ files:
 - lib/toquen/version.rb
 - toquen.gemspec
 homepage: https://github.com/bmuller/toquen
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -112,18 +113,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: 'Toquen: Capistrano + AWS + Chef-Solo'
+summary: 'Toquen: Joins Capistrano + AWS + Chef-Solo into small devops ease'
 test_files: []