itamae-plugin-recipe-consul 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d69ab6db75c91fa87795e4d910b02e86a5a1db92
-  data.tar.gz: 72a9eba2ebe31b0ec6955c86f772302c6b1e1b71
+SHA256:
+  metadata.gz: e696e3eb11310355191152bffd9628e2556d96bce76895d6dbbef62d1b2fa5a6
+  data.tar.gz: cd1d01c5851c933dfabcd59e7d5b3ddd0f05e59a0d28c332ec36d7961a76976f
 SHA512:
-  metadata.gz: 64e45d2972b33617b39778d2c38c968f157b6f947c394e53f993189dc1f91278082314682449644d484f28eec5a21331c88b290965dc375566def142a23ca6b7
-  data.tar.gz: 781e7be854ce73c2c85195dc120d86b99c08992a58f44dfe8410e77c222ea625c778f7df68857c860af32bc8fcdce70791b88571b752430820da73d6e2fc3695
+  metadata.gz: a2a65c97992569d060cdc56a6572cb62f3eaada86176bda14e2dc78ee6c48a51cbe7ffb00234fb22cd1dd123e2bf531a4d84ee06e994c4b23eb51cd84205f76a
+  data.tar.gz: 814e154186854fa87a53950e68f770d8a8478c395dcc7af0c1b15370728aaf46d6f0757e06a4d2b247b4e307839e6e2e821b6fd509a8883afab52b30c40cb1b8

data/.gitignore

@@ -7,4 +7,3 @@
 /pkg/
 /spec/reports/
 /tmp/
-.vagrant/

data/.travis.yml

@@ -0,0 +1,26 @@
+language: ruby
+sudo: required
+services:
+  - docker
+rvm:
+  - 2.3
+env:
+  - IMAGE=centos:7
+  - IMAGE=debian:jessie
+bundler_args: "--jobs=4"
+cache: bundler
+before_install:
+  - travis_retry gem update --system || travis_retry gem update --system 2.7.8
+  - travis_retry gem install bundler --no-document || travis_retry gem install bundler --no-document -v 1.17.3
+before_script:
+  - docker run --privileged -d --name container-with-service $IMAGE /sbin/init
+script:
+  - bundle exec itamae docker --node-yaml=recipes/node.yml recipes/install.rb --container=container-with-service --tag itamae-plugin:latest
+  - DOCKER_CONTAINER=container-with-service bundle exec rspec
+branches:
+  only:
+    - master
+notifications:
+  email: false
+  slack:
+    secure: M93HeWW+fQk+PrzI2mdtnlVkpiMVfQcfujFXl76ly0EtLS3V9p5KKHSyduQ2t7j/KOoRVF+86sEdPZJg16Ha+Y9pVE2oAs7SMv57rT9HaoQtzf5kZo64eCy63+iV+jUZ4U+NitrtNM1vELKyOsSgAq/KJblq9U67Wto3lOsRec7rskwlkjRwqV4TQElqbA1h4oyWyQG0SMKNnmKYV6TFC0/UNjnYLkxNY3btcOB/PYURxfcwbZk9IU+7id2MM4uG8cBVGSjqOglYOWdpWxTCJpZ6YQGdmXsICa38D/Y3crEHLcUAE4DkaPHpTSVdjVm0kvQlUDuLOmHe+Eh4lm6zy8NCMpyO80/C74/OQQdQgDkohKFI8RX/BZnKdQAmZZf8cIdfe4pF4cZGB8mzGcBcpSBApQHEXZyuJF5u9clNW6+Cdo8jtps0c7Nqg3NWebpUCqwiTVR95Dr820sO6wtIlqlNB5AaNpHzefFoxd42pRm5+Ua9rDuoDuRyhVuWcUQCOn9ScqjhsY9q1UIRbgF03ILgDFmFTu/ClaJ7tOtAtE9n7IsibNf87o2Lz+rNQUrIzIZUo7vElrCub0RhgZFy9+sfplHyIR5CBD4y/9Ca6KoB06vzyb3Y7ElXwIifwbGQ3EQZdAWV6V7slVP83+ahHD+K0E+EPLzAqaDum0MkeqI=

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Change Log
 
+## [v0.1.4](https://github.com/sue445/itamae-plugin-recipe-consul/tree/v0.1.4) (2019-03-29)
+
+[Full Changelog](https://github.com/sue445/itamae-plugin-recipe-consul/compare/v0.1.3...v0.1.4)
+
+**Merged pull requests:**
+
+- Added unzip option to overwrite consul binary [\#23](https://github.com/sue445/itamae-plugin-recipe-consul/pull/23) ([varusan](https://github.com/varusan))
+- Fix CI for bundler v2 [\#22](https://github.com/sue445/itamae-plugin-recipe-consul/pull/22) ([sue445](https://github.com/sue445))
+- Dockerlize [\#21](https://github.com/sue445/itamae-plugin-recipe-consul/pull/21) ([sue445](https://github.com/sue445))
+- Drop CentOS 6.5 [\#20](https://github.com/sue445/itamae-plugin-recipe-consul/pull/20) ([sue445](https://github.com/sue445))
+- centos70 -\> 7 [\#19](https://github.com/sue445/itamae-plugin-recipe-consul/pull/19) ([sue445](https://github.com/sue445))
+- Update CI image [\#18](https://github.com/sue445/itamae-plugin-recipe-consul/pull/18) ([sue445](https://github.com/sue445))
+
+## [v0.1.3](https://github.com/sue445/itamae-plugin-recipe-consul/tree/v0.1.3) (2016-10-05)
+[Full Changelog](https://github.com/sue445/itamae-plugin-recipe-consul/compare/v0.1.3.beta1...v0.1.3)
+
+**Merged pull requests:**
+
+- \[CI\] Migrate to workflow [\#17](https://github.com/sue445/itamae-plugin-recipe-consul/pull/17) ([sue445](https://github.com/sue445))
+- \[CI\] refactor [\#16](https://github.com/sue445/itamae-plugin-recipe-consul/pull/16) ([sue445](https://github.com/sue445))
+- \[CI\] Migrate to container [\#15](https://github.com/sue445/itamae-plugin-recipe-consul/pull/15) ([sue445](https://github.com/sue445))
+- Update box [\#14](https://github.com/sue445/itamae-plugin-recipe-consul/pull/14) ([sue445](https://github.com/sue445))
+- Add service\_actions to node [\#13](https://github.com/sue445/itamae-plugin-recipe-consul/pull/13) ([sue445](https://github.com/sue445))
+
+## [v0.1.3.beta1](https://github.com/sue445/itamae-plugin-recipe-consul/tree/v0.1.3.beta1) (2016-07-06)
+[Full Changelog](https://github.com/sue445/itamae-plugin-recipe-consul/compare/v0.1.2...v0.1.3.beta1)
+
 ## [v0.1.2](https://github.com/sue445/itamae-plugin-recipe-consul/tree/v0.1.2) (2016-05-19)
 [Full Changelog](https://github.com/sue445/itamae-plugin-recipe-consul/compare/v0.1.1...v0.1.2)
 

data/README.md

@@ -3,9 +3,7 @@
 Itamae plugin to install [Consul](https://www.consul.io/) with init scripts
 
 [![Gem Version](https://badge.fury.io/rb/itamae-plugin-recipe-consul.svg)](https://badge.fury.io/rb/itamae-plugin-recipe-consul)
-[![Dependency Status](https://gemnasium.com/badges/github.com/sue445/itamae-plugin-recipe-consul.svg)](https://gemnasium.com/github.com/sue445/itamae-plugin-recipe-consul)
-
-[![wercker status](https://app.wercker.com/status/1d28d36364b4f79161fc248c6c934072/m/master "wercker status")](https://app.wercker.com/project/bykey/1d28d36364b4f79161fc248c6c934072)
+[![Build Status](https://travis-ci.org/sue445/itamae-plugin-recipe-consul.svg?branch=master)](https://travis-ci.org/sue445/itamae-plugin-recipe-consul)
 
 ## Supported
 * CentOS 6 (init.d)
@@ -87,18 +85,16 @@ After checking out the repo, run `bin/setup` to install dependencies. You can al
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Testing
-requirements [Vagrant](https://www.vagrantup.com/)
+requirements [Docker](https://www.docker.com/)
 
 e.g) test on CentOS 7.0
 
 ```sh
-vagrant up centos70
-bundle exec rake itamae:centos70
-bundle exec rake spec:centos70
+docker run --privileged -d --name container-with-service centos:7 /sbin/init
+bundle exec itamae docker --node-yaml=recipes/node.yml recipes/install.rb --container=container-with-service --tag itamae-plugin:latest
+DOCKER_CONTAINER=container-with-service bundle exec rspec
 ```
 
-Avairable hosts are defined in [Vagrantfile](Vagrantfile) and [Rakefile](Rakefile)
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/sue445/itamae-plugin-recipe-consul.

data/Rakefile

@@ -1,30 +1 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-task :spec => "spec:all"
-
-HOSTS = %w(centos65 centos70 debian8)
-
-namespace :spec do
-  task :all => HOSTS
-
-  HOSTS.each do |host|
-    desc "Run serverspec to #{host}"
-    RSpec::Core::RakeTask.new(host.to_sym) do |t|
-      puts "Running tests to #{host} ..."
-      ENV["TARGET_HOST"] = host
-      t.pattern = "spec/**/*_spec.rb"
-    end
-  end
-end
-
-namespace :itamae do
-  task :all => HOSTS
-
-  HOSTS.each do |host|
-    desc "Run itamae to #{host}"
-    task host do
-      sh "itamae ssh --host=#{host} --vagrant --node-yaml=recipes/node.yml recipes/install.rb"
-    end
-  end
-end

data/itamae-plugin-recipe-consul.gemspec

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

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

@@ -7,6 +7,6 @@ http_request "#{node[:consul][:src_dir]}/#{zip_name}" do
   url "https://releases.hashicorp.com/consul/#{node[:consul][:version]}/#{zip_name}"
 end
 
-execute "unzip #{node[:consul][:src_dir]}/#{zip_name} -d #{node[:consul][:bin_dir]}" do
+execute "unzip -o #{node[:consul][:src_dir]}/#{zip_name} -d #{node[:consul][:bin_dir]}" do
   not_if "#{node[:consul][:bin_dir]}/consul --version | grep #{node[:consul][:version]}"
 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"
+        VERSION = "0.1.4"
       end
     end
   end

data/recipes/install.rb

@@ -1 +1,6 @@
+case node[:platform]
+when "debian", "ubuntu"
+  execute "apt-get update"
+end
+
 include_recipe "consul"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-consul
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2019-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  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
@@ -75,16 +89,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- Vagrantfile
 - 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
@@ -100,7 +112,6 @@ files:
 - lib/itamae/plugin/recipe/consul/version.rb
 - recipes/install.rb
 - recipes/node.yml
-- wercker.yml
 homepage: https://github.com/sue445/itamae-plugin-recipe-consul
 licenses:
 - MIT
@@ -120,8 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Itamae plugin to install Consul with init scripts

data/Vagrantfile

@@ -1,115 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
-  config.vm.provider :digital_ocean do |provider, override|
-    override.vm.box     = "digital_ocean"
-    override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box"
-    provider.token      = ENV["DIGITALOCEAN_ACCESS_TOKEN"]
-    provider.region     = "nyc3"
-    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
-      provider.ssh_key_name = "local"
-      override.ssh.private_key_path = "~/.ssh/id_rsa"
-    end
-  end
-
-  config.vm.define :centos65 do |c|
-    c.vm.box = "puphpet/centos65-x64"
-    c.vm.provider :digital_ocean do |provider, override|
-      provider.image = "centos-6-5-x64"
-    end
-    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|
-    c.vm.box = "centos/7"
-    c.vm.provider :digital_ocean do |provider, override|
-      provider.image = "centos-7-0-x64"
-    end
-    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|
-    c.vm.box = "debian/jessie64"
-    c.vm.provider :digital_ocean do |provider, override|
-      provider.image = "debian-8-x64"
-    end
-    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.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
-  # config.vm.box = "base"
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-  #   vb.memory = "1024"
-  # end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  # config.vm.provision "shell", inline: <<-SHELL
-  #   sudo apt-get update
-  #   sudo apt-get install -y apache2
-  # SHELL
-end

data/ci/build.sh

@@ -1,7 +0,0 @@
-#!/bin/bash -xe
-
-readonly HOST=$1
-
-vagrant up $HOST --provider=digital_ocean
-bundle exec rake itamae:$HOST
-bundle exec rake spec:$HOST

data/ci/setup.sh

@@ -1,25 +0,0 @@
-#!/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/wercker.yml

@@ -1,75 +0,0 @@
-# This references the default Ruby container from
-# the Docker Hub.
-# https://registry.hub.docker.com/_/ruby/
-# If you want to use a specific version you would use a tag:
-# ruby:2.2.2
-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:
-    # - postgres
-    # http://devcenter.wercker.com/docs/services/postgresql.html
-
-    # - mongodb
-    # http://devcenter.wercker.com/docs/services/mongodb.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:
-
-build-centos65:
-    <<: *default
-    steps:
-        - script:
-            name: setup
-            code: ./ci/setup.sh
-
-        - bundle-install:
-            jobs: 4
-
-        - script:
-            name: build CentOS 6.5
-            code: ./ci/build.sh centos65
-
-build-centos70:
-    <<: *default
-    steps:
-        - script:
-            name: setup
-            code: ./ci/setup.sh
-
-        - bundle-install:
-            jobs: 4
-
-        - script:
-            name: build CentOS 7.0
-            code: ./ci/build.sh centos70
-
-build-debian8:
-    <<: *default
-    steps:
-        - script:
-            name: setup
-            code: ./ci/setup.sh
-
-        - bundle-install:
-            jobs: 4
-
-        - script:
-            name: build Debian 8
-            code: ./ci/build.sh debian8