itamae 1.0.0.beta8 → 1.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42aaacb52f264283b58b0fe62dd723ec02a6f6f5
-  data.tar.gz: c288561f91f88f46979c43c4bd809f0ccb8a38b8
+  metadata.gz: 316546d4d9112ec266c35d0e68ac945bff9c89db
+  data.tar.gz: c0f441c234e8a246ef88c5b986b40fe303aa3641
 SHA512:
-  metadata.gz: 8977726e0c923e4055af6ce1c0492e5e375cc461cc3d67516650c12354e6a6aff10cdd1aac4317fb5866609246efe204c1a8191de2164b55b1d93f6ec7c9f97b
-  data.tar.gz: b500d236ff804664009b79747be7e52068462a28dedb3b099f5a72f547da1f8df631d9e5bc3851b3e26a335a5ba1f984ce5fe279558d68a84fc76f356868f002
+  metadata.gz: 9e09edb03f591ab95907efa644c85ba8a4a3d8ce4acbd158812ffe6785bd1c22c022987e17a9988fcfb9216f41c6e03bc42a9e85c5778a53175582f5df07d27a
+  data.tar.gz: 706adb717f18b87638c9aa0933b767e7b8c33eb44a9dfe6e474e95c0642a8a6f491d4791371731719b4987599b2eb933d7e08587f161ab6387853c9058f6ee09

data/README.md

@@ -1,4 +1,4 @@
-# Itamae [![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae)
+# Itamae [![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![wercker status](https://app.wercker.com/status/d44df82d2f4529ff664f32fa54ce12f5/s/master "wercker status")](https://app.wercker.com/project/bykey/d44df82d2f4529ff664f32fa54ce12f5)
 
 Simple and lightweight configuration management tool inspired by Chef.
 

data/Rakefile

@@ -3,6 +3,8 @@ require 'rspec/core/rake_task'
 require 'tempfile'
 require 'net/ssh'
 
+vagrant_bin = ENV['CI'] ? 'vagrant' : '/usr/bin/vagrant'
+
 desc 'Run unit and integration specs.'
 task :spec => ['spec:unit', 'spec:integration:all']
 
@@ -15,7 +17,7 @@ namespace :spec do
   namespace :integration do
     targets = []
     Bundler.with_clean_env do
-      `cd spec/integration && /usr/bin/vagrant status`.split("\n\n")[1].each_line do |line|
+      `cd spec/integration && #{vagrant_bin} status`.split("\n\n")[1].each_line do |line|
         targets << line.match(/^[^ ]+/)[0]
       end
     end
@@ -31,8 +33,8 @@ namespace :spec do
           Bundler.with_clean_env do
             config = Tempfile.new('', Dir.tmpdir)
             env = {"VAGRANT_CWD" => File.expand_path('./spec/integration')}
-            system env, "/usr/bin/vagrant up #{target}"
-            system env, "/usr/bin/vagrant ssh-config #{target} > #{config.path}"
+            system env, "#{vagrant_bin} up #{target}"
+            system env, "#{vagrant_bin} ssh-config #{target} > #{config.path}"
             options = Net::SSH::Config.for(target, [config.path])
 
             cmd = "bundle exec bin/itamae ssh"
@@ -75,3 +77,4 @@ namespace :release do
     system "git commit -m 'Bump up version'"
   end
 end
+

data/lib/itamae/resource/base.rb

@@ -109,13 +109,18 @@ module Itamae
       private
 
       def method_missing(method, *args, &block)
-        if args.size == 1 && self.class.defined_attributes[method]
-          return @attributes[method] = args.first
-        elsif args.size == 0 && block_given?
-          return @attributes[method] = block
-        elsif args.size == 0 && @attributes.has_key?(method)
+        if self.class.defined_attributes[method]
+          if args.size == 1
+            return @attributes[method] = args.first
+          elsif args.size == 0 && block_given?
+            return @attributes[method] = block
+          end
+        end
+
+        if args.size == 0 && @attributes.has_key?(method)
           return @attributes[method]
         end
+
         super
       end
 
@@ -136,7 +141,11 @@ module Itamae
       def show_differences
         @current_attributes.each_pair do |key, current_value|
           value = @attributes[key]
-          if current_value == value || value.nil?
+          if current_value.nil? && value.nil?
+            # ignore
+          elsif current_value.nil? && !value.nil?
+            Logger.info "  #{key} will be '#{value}'"
+          elsif current_value == value || value.nil?
             Logger.info "  #{key} will not change (current value is '#{current_value}')"
           else
             Logger.info "  #{key} will change from '#{current_value}' to '#{value}'"

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta8
+1.0.0.beta9

data/spec/integration/Vagrantfile

@@ -6,14 +6,29 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define :trusty do |c|
-    c.vm.box = "ubuntu/trusty64"
+    c.vm.hostname  = 'itamae-trusty'
+    c.vm.hostname += "-#{ENV['WERCKER_BUILD_ID']}" if ENV['WERCKER_BUILD_ID']
+    c.vm.provider :virtualbox do |provider, override|
+      override.vm.box = "ubuntu/trusty64"
+      override.vm.provision :shell, inline: <<-EOC
+  cat /etc/apt/sources.list | sed -e 's|http://[^ ]*|mirror://mirrors.ubuntu.com/mirrors.txt|g' > /tmp/sources.list
+  if !(diff -q /etc/apt/sources.list /tmp/sources.list); then
+    mv /tmp/sources.list /etc/apt/sources.list
+    apt-get update
+  fi
+      EOC
+    end
 
-    c.vm.provision :shell, inline: <<-EOC
-cat /etc/apt/sources.list | sed -e 's|http://[^ ]*|mirror://mirrors.ubuntu.com/mirrors.txt|g' > /tmp/sources.list
-if !(diff -q /etc/apt/sources.list /tmp/sources.list); then
-  mv /tmp/sources.list /etc/apt/sources.list
-  apt-get update
-fi
-    EOC
+    c.vm.provider :digital_ocean do |provider, override|
+      override.ssh.private_key_path = '~/.ssh/id_rsa.vagrant'
+      override.vm.box = 'digital_ocean'
+      override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box"
+
+      provider.ssh_key_name = ENV['WERCKER'] ? 'vagrant/wercker/itamae' : 'Vagrant'
+      provider.token = ENV['DIGITALOCEAN_TOKEN']
+      provider.image = 'Ubuntu 14.04 x64'
+      provider.region = 'nyc2'
+      provider.size = '512mb'
+    end
   end
 end

data/spec/integration/default_spec.rb

@@ -16,8 +16,8 @@ end
 describe file('/tmp/directory') do
   it { should be_directory }
   it { should be_mode 700 }
-  it { should be_owned_by "vagrant" }
-  it { should be_grouped_into "vagrant" }
+  it { should be_owned_by "itamae" }
+  it { should be_grouped_into "itamae" }
 end
 
 describe file('/tmp/template') do

data/spec/integration/recipes/default.rb

@@ -1,3 +1,8 @@
+# TODO: replace with user resource
+execute 'id itamae || useradd itamae'
+
+######
+
 package 'dstat' do
   action :install
 end
@@ -50,8 +55,8 @@ end
 
 directory "/tmp/directory" do
   mode "700"
-  owner "vagrant"
-  group "vagrant"
+  owner "itamae"
+  group "itamae"
 end
 
 template "/tmp/template" do

data/wercker.yml

@@ -0,0 +1,76 @@
+box: wercker/rvm
+# Build definition
+build:
+  # The steps that will be executed on build
+  # See the Ruby section on the wercker devcenter:
+  # http://devcenter.wercker.com/articles/languages/ruby.html
+  steps:
+    # Uncomment this to force RVM to use a specific Ruby version
+    - rvm-use:
+        version: 2.1.1
+
+    # A step that executes `bundle install` command
+    - bundle-install
+
+    # A custom script step, name value is used in the UI
+    # and the code value contains the command that get executed
+    - script:
+        name: echo ruby information
+        code: |
+          echo "ruby version $(ruby --version) running"
+          echo "from location $(which ruby)"
+          echo -p "gem list: $(gem list)"
+
+    - script:
+        name: create .ssh directory
+        code: mkdir -p $HOME/.ssh
+
+    - create-file:
+        name: put private key
+        filename: $HOME/.ssh/id_rsa.vagrant
+        overwrite: true
+        hide-from-log: true
+        content: $DIGITALOCEAN_PRIVATE_KEY
+
+    - create-file:
+        name: put public key
+        filename: $HOME/.ssh/id_rsa.vagrant.pub
+        overwrite: true
+        hide-from-log: true
+        content: $DIGITALOCEAN_PUBLIC_KEY
+
+    - script:
+        name: chmod 600 id_rsa
+        code: chmod 600 $HOME/.ssh/id_rsa.vagrant
+
+    - script:
+        name: download vagrant
+        code: wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.deb
+
+    - script:
+        name: install vagrant
+        code: sudo dpkg -i vagrant_1.6.3_x86_64.deb
+
+    - script:
+        name: install libxml and libxslt
+        code: sudo apt-get install libxml2-dev libxslt1-dev
+
+    - script:
+        name: install vagrant-digitalocean
+        code: NOKOGIRI_USE_SYSTEM_LIBRARIES=1 vagrant plugin install vagrant-digitalocean
+
+    - script:
+        name: start vm
+        code: vagrant up --provider=digital_ocean
+        cwd: spec/integration
+
+    # Add more steps here:
+    - script:
+        name: rspec
+        code: bundle exec rake spec
+
+  after-steps:
+    - script:
+        name: shutdown vm
+        code: vagrant destroy -f
+        cwd: spec/integration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta8
+  version: 1.0.0.beta9
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -146,7 +146,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -192,6 +191,7 @@ files:
 - spec/unit/lib/itamae/resource_spec.rb
 - spec/unit/lib/itamae/runner_spec.rb
 - spec/unit/spec_helper.rb
+- wercker.yml
 homepage: https://github.com/ryotarai/itamae
 licenses:
 - MIT

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - "2.0.0"
-  - "1.9.3"
-script:
-  - bundle exec rake spec:unit