itamae-plugin-recipe-consul 0.1.3.beta1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b44d7a47dc95c38c07c81d882a8f3fc82f34fb5
-  data.tar.gz: 78982cebc8d13d89f8d8323efdde76e2962b5db1
+  metadata.gz: d69ab6db75c91fa87795e4d910b02e86a5a1db92
+  data.tar.gz: 72a9eba2ebe31b0ec6955c86f772302c6b1e1b71
 SHA512:
-  metadata.gz: 98d7bf0b7c2a4f3ae9a174806dfbbd77bbd8e2463d10e7ef2eec7bd74a5b4bb7e3d91636f0330d44a2d6057456463da5255fe029fd2398395e5a25c491889bbc
-  data.tar.gz: d08ad421785210b9bbafb2c424de49eb3f6d751b339cd7e21dc8b83fb9ee6b2e0d1d4299e5110fb3684f31728911bd8c9996915ece70a104c27c0930b4f6a0b7
+  metadata.gz: 64e45d2972b33617b39778d2c38c968f157b6f947c394e53f993189dc1f91278082314682449644d484f28eec5a21331c88b290965dc375566def142a23ca6b7
+  data.tar.gz: 781e7be854ce73c2c85195dc120d86b99c08992a58f44dfe8410e77c222ea625c778f7df68857c860af32bc8fcdce70791b88571b752430820da73d6e2fc3695

data/Rakefile

@@ -24,7 +24,7 @@ namespace :itamae do
   HOSTS.each do |host|
     desc "Run itamae to #{host}"
     task host do
-      sh "bundle exec itamae ssh --host=#{host} --vagrant --node-yaml=recipes/node.yml recipes/install.rb"
+      sh "itamae ssh --host=#{host} --vagrant --node-yaml=recipes/node.yml recipes/install.rb"
     end
   end
 end

data/Vagrantfile

@@ -14,6 +14,7 @@ Vagrant.configure(2) do |config|
     provider.size       = "512MB"
 
     if ENV["WERCKER"] == "true"
+      override.vm.synced_folder ".", "/vagrant", disabled: true
       provider.ssh_key_name = "wercker-#{ENV['WERCKER_GIT_REPOSITORY']}"
       override.ssh.private_key_path = "~/.ssh/id_rsa.vagrant"
     else
@@ -27,8 +28,8 @@ Vagrant.configure(2) do |config|
     c.vm.provider :digital_ocean do |provider, override|
       provider.image = "centos-6-5-x64"
     end
-    c.vm.hostname  = 'itamae-centos65'
-    c.vm.hostname  += "-#{ENV['WERCKER_BUILD_ID']}" if ENV['WERCKER_BUILD_ID']
+    c.vm.hostname  = 'itamae-consul-centos65'
+    c.vm.hostname  += "-#{ENV['WERCKER_RUN_ID']}" if ENV['WERCKER_RUN_ID']
   end
 
   config.vm.define :centos70 do |c|
@@ -36,8 +37,8 @@ Vagrant.configure(2) do |config|
     c.vm.provider :digital_ocean do |provider, override|
       provider.image = "centos-7-0-x64"
     end
-    c.vm.hostname  = 'itamae-centos70'
-    c.vm.hostname  += "-#{ENV['WERCKER_BUILD_ID']}" if ENV['WERCKER_BUILD_ID']
+    c.vm.hostname  = 'itamae-consul-centos70'
+    c.vm.hostname  += "-#{ENV['WERCKER_RUN_ID']}" if ENV['WERCKER_RUN_ID']
   end
 
   config.vm.define :debian8 do |c|
@@ -45,8 +46,8 @@ Vagrant.configure(2) do |config|
     c.vm.provider :digital_ocean do |provider, override|
       provider.image = "debian-8-x64"
     end
-    c.vm.hostname  = 'itamae-debian8'
-    c.vm.hostname  += "-#{ENV['WERCKER_BUILD_ID']}" if ENV['WERCKER_BUILD_ID']
+    c.vm.hostname  = 'itamae-consul-debian8'
+    c.vm.hostname  += "-#{ENV['WERCKER_RUN_ID']}" if ENV['WERCKER_RUN_ID']
   end
 
   # The most common configuration options are documented and commented below.

data/ci/setup.sh

@@ -0,0 +1,25 @@
+#!/bin/bash -xe
+
+wget https://releases.hashicorp.com/vagrant/1.8.4/vagrant_1.8.4_x86_64.rpm
+rpm -i vagrant_1.8.4_x86_64.rpm
+vagrant plugin install vagrant-digitalocean
+
+# NOTE: vagrant v1.8.4 depends on bundler v1.12.5
+# https://github.com/mitchellh/vagrant/blob/v1.8.4/vagrant.gemspec#L23
+gem uninstall bundler --all --force
+gem install bundler -v 1.12.5 --no-document
+
+
+mkdir -m 700 -p $HOME/.ssh
+
+#########################
+# put ssh keys
+set +x
+
+echo -e "$DIGITALOCEAN_KEY_PRIVATE" > $HOME/.ssh/id_rsa.vagrant
+echo -e "$DIGITALOCEAN_KEY_PUBLIC"  > $HOME/.ssh/id_rsa.vagrant.pub
+
+set -x
+#########################
+
+chmod 600 $HOME/.ssh/id_rsa.vagrant

data/itamae-plugin-recipe-consul.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "itamae"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "paraduct"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "serverspec"
 end

data/lib/itamae/plugin/recipe/consul/version.rb

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module Consul
-        VERSION = "0.1.3.beta1"
+        VERSION = "0.1.3"
       end
     end
   end

data/wercker.yml

@@ -3,7 +3,7 @@
 # https://registry.hub.docker.com/_/ruby/
 # If you want to use a specific version you would use a tag:
 # ruby:2.2.2
-box: sue445/rvm-vagrant-digitalocean@1.0.0
+box: drecom/centos-ruby:2.3.1
 # You can also use services such as databases. Read more on our dev center:
 # http://devcenter.wercker.com/docs/services/index.html
 # services:
@@ -13,58 +13,63 @@ box: sue445/rvm-vagrant-digitalocean@1.0.0
     # - mongodb
     # http://devcenter.wercker.com/docs/services/mongodb.html
 
-# This is the build pipeline. Pipelines are the core of wercker
-# Read more about pipelines on our dev center
-# http://devcenter.wercker.com/docs/pipelines/index.html
+default: &default
+    after-steps:
+        - script:
+            name: set variables
+            code: |
+                # NOTE: override .ruby-version in pretty-slack-notify
+                export RBENV_VERSION=2.3.1
+
+        - script:
+            name: remove all vms
+            code: vagrant destroy -f
+
+        - wantedly/pretty-slack-notify:
+            webhook_url: $SLACK_WEBHOOK_URL
+            username: wercker_build
+
 build:
-    # Steps make up the actions in your pipeline
-    # Read more about steps on our dev center:
-    # http://devcenter.wercker.com/docs/steps/index.html
     steps:
-        - rvm-use:
-            version: 2.3.0
 
+build-centos65:
+    <<: *default
+    steps:
         - script:
-            name: install bundler
-            code: gem install bundler -v 1.10.6 --no-document
+            name: setup
+            code: ./ci/setup.sh
 
         - bundle-install:
             jobs: 4
 
         - script:
-            name: echo ruby information
-            code: |
-                echo "ruby version $(ruby --version) running"
-                echo "from location $(which ruby)"
-                echo -p "gem list: $(gem list)"
+            name: build CentOS 6.5
+            code: ./ci/build.sh centos65
 
+build-centos70:
+    <<: *default
+    steps:
         - script:
-            name: create .ssh directory
-            code: mkdir -m 700 -p $HOME/.ssh
+            name: setup
+            code: ./ci/setup.sh
 
-        - create-file:
-            name: put private key
-            filename: $HOME/.ssh/id_rsa.vagrant
-            overwrite: true
-            hide-from-log: true
-            content: $DIGITALOCEAN_KEY_PRIVATE
-
-        - create-file:
-            name: put public key
-            filename: $HOME/.ssh/id_rsa.vagrant.pub
-            overwrite: true
-            hide-from-log: true
-            content: $DIGITALOCEAN_KEY_PUBLIC
+        - bundle-install:
+            jobs: 4
 
         - script:
-            name: chmod 600 id_rsa
-            code: chmod 600 $HOME/.ssh/id_rsa.vagrant
+            name: build CentOS 7.0
+            code: ./ci/build.sh centos70
 
+build-debian8:
+    <<: *default
+    steps:
         - script:
-            name: paraduct test
-            code: bundle exec paraduct test
+            name: setup
+            code: ./ci/setup.sh
 
-    after-steps:
-        - wantedly/pretty-slack-notify:
-            webhook_url: $SLACK_WEBHOOK_URL
-            username: wercker_build
+        - bundle-install:
+            jobs: 4
+
+        - script:
+            name: build Debian 8
+            code: ./ci/build.sh debian8

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-consul
 version: !ruby/object:Gem::Version
-  version: 0.1.3.beta1
+  version: 0.1.3
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: paraduct
-  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +74,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".paraduct.yml"
 - ".rspec"
 - CHANGELOG.md
 - Gemfile
@@ -99,6 +84,7 @@ files:
 - bin/console
 - bin/setup
 - ci/build.sh
+- ci/setup.sh
 - itamae-plugin-recipe-consul.gemspec
 - lib/itamae/plugin/recipe/consul.rb
 - lib/itamae/plugin/recipe/consul/default.rb
@@ -130,9 +116,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/.paraduct.yml

@@ -1,10 +0,0 @@
-script: |-
-  ./ci/build.sh ${HOST}
-after_script: |-
-  vagrant destroy -f $HOST
-variables:
-  HOST:
-    - centos65
-    - centos70
-    - debian8
-max_threads: 4