specinfra 1.25.4 → 1.25.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24e1bd17c3dd9225965333243be3fa6c1b5302fe
-  data.tar.gz: dcd388398d12dbb60bf43f10553a917c632b5569
+  metadata.gz: f504435fadd0a887a9b82ec9e5aacbf6ee07b084
+  data.tar.gz: 06dc4d2d2733263023623ef6b2d3b40bcdc551c9
 SHA512:
-  metadata.gz: c93790a2b2549d3d488caaa707313f948a325d30627ad9230cb0d7fb15561b1a9454be116cceb636bfa3d16d53a4ced03a76e377ab4bde330155329db1b201da
-  data.tar.gz: f1252f2816c8507e55cce54bdee9651c74c7917af55c083620ffd106fe5895f3967095977d36ddd0d0da0dacb9f2b978d1da1c435ffeb61e9fd67f07aa6ea87f
+  metadata.gz: e84619778932bd5a3fc1306634ed21eba3b99c2549a15910e9d4789494b78663103b309fff646c3871f0a1fbdb65a402e944d047573ec5d374aae52350342d54
+  data.tar.gz: 9525eab540db91b5777491fccff4bf2ea745d01e7794d0bf553fbf929290dee6c1124ce78735b10b478ab6fe7ebd4b3b5a38b7e02639cdccfc810694404e73d8

data/lib/specinfra/command/base.rb

@@ -168,10 +168,10 @@ module SpecInfra
         from ||= '1'
         to ||= '$'
         sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
-        sed_end = "sed -n 1,#{escape(to)}p"
+        sed += " | sed -n 1,#{escape(to)}p" if from != '1' and to != '$'
         checker_with_regexp = check_file_contain_with_regexp("-", expected_pattern)
         checker_with_fixed  = check_file_contain_with_fixed_strings("-", expected_pattern)
-        "#{sed} | #{sed_end} | #{checker_with_regexp} || #{sed} | #{sed_end} | #{checker_with_fixed}"
+        "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
       end
 
       def check_file_contain_lines(file, expected_lines, from=nil, to=nil)

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.25.4"
+  VERSION = "1.25.5"
 end

data/wercker.yml

@@ -26,35 +26,55 @@ build:
         name: Run vagrant up centos65
         code: vagrant up centos65 --provider=digital_ocean
         cwd: $WORKING_DIR
+    - script:
+        name: Run itamae
+        code: bundle exec ./itamae.rb centos65
+        cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload centos65
         code: vagrant reload centos65
         cwd: $WORKING_DIR
     - script:
         name: Run rake spec:centos65
-        code: rake spec:centos65
+        code: DIGITALOCEAN=true rake spec:centos65
+        cwd: $WORKING_DIR
+    - script:
+        name: Run vagrant up centos70
+        code: vagrant up centos70 --provider=digital_ocean
+        cwd: $WORKING_DIR
+    - script:
+        name: Run itamae
+        code: bundle exec ./itamae.rb centos70
+        cwd: $WORKING_DIR
+    - script:
+        name: Run vagrant reload centos70
+        code: vagrant reload centos70
+        cwd: $WORKING_DIR
+    - script:
+        name: Run rake spec:centos70
+        code: DIGITALOCEAN=true rake spec:centos70
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant up ubuntu1404
         code: vagrant up ubuntu1404 --provider=digital_ocean
         cwd: $WORKING_DIR
+    - script:
+        name: Run itamae
+        code: bundle exec ./itamae.rb ubuntu1404
+        cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload ubuntu1404
         code: vagrant reload ubuntu1404
         cwd: $WORKING_DIR
     - script:
         name: Run rake spec:ubuntu1404
-        code: rake spec:ubuntu1404
+        code: DIGITALOCEAN=true rake spec:ubuntu1404
         cwd: $WORKING_DIR
 
   after-steps:
     - script:
-        name: Run vagrant destroy centos65
-        code: vagrant destroy centos65 --force
-        cwd: $WORKING_DIR
-    - script:
-        name: Run vagrant destroy ubuntu1404
-        code: vagrant destroy ubuntu1404 --force
+        name: Run vagrant destroy
+        code: vagrant destroy --force
         cwd: $WORKING_DIR
     - 1syo/idobata-notify@0.1.1:
         token: $IDOBATA_TOKEN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 1.25.4
+  version: 1.25.5
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler