specinfra 1.25.2 → 1.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a076b6c4ff4dedf6e97ed95ccb0ad13d1410bb74
-  data.tar.gz: e36e8c03fa624d69a9a66fe6bde2eb9b5452d756
+  metadata.gz: ff3390c62121f1e0448c025ad870cb450fcf8946
+  data.tar.gz: 4bc6cda5c7746d33e81af89cbfa187b5121d8768
 SHA512:
-  metadata.gz: 9d502317a3445893660be2ba77f92c61feff915e17bdd7b11161bfed3587a75c76dcccb9c5b84f826200cd36724bbbf74e4d408e29df4da0c0c02281a9524586
-  data.tar.gz: 8ec327e27be2f12242589762299bcd1e49d233c33eec2feb07e7ab5c07a5c1a3643637f8f8df9df5c59734c97988c2efe521ca17f29bbb0aaf79a4e8cce52b61
+  metadata.gz: 115bc92c3ce9271ac12fe1ed231e759390037184dfe3d98c84a22dcaa467788fd9adbfb59f136975aa5e44c36ab4720847d4aad7ac09773c55ce841a633a6815
+  data.tar.gz: 235ee55e984d71b135131a92e9d8bf3a9c4cfb28b46557699d8e8714018494146bceb48df31d48103c1c7543ce84004274dd4f582f1fd35918984679a635a9de

data/lib/specinfra/command/base.rb

@@ -168,9 +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"
         checker_with_regexp = check_file_contain_with_regexp("-", expected_pattern)
         checker_with_fixed  = check_file_contain_with_fixed_strings("-", expected_pattern)
-        "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
+        "#{sed} | #{sed_end} | #{checker_with_regexp} || #{sed} | #{sed_end} | #{checker_with_fixed}"
       end
 
       def check_file_contain_lines(file, expected_lines, from=nil, to=nil)

data/lib/specinfra/command/solaris.rb

@@ -76,9 +76,10 @@ module SpecInfra
         from ||= '1'
         to ||= '$'
         sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
+        sed_end = "sed -n 1,#{escape(to)}p"
         checker_with_regexp = check_file_contain_with_regexp("/dev/stdin", expected_pattern)
         checker_with_fixed  = check_file_contain_with_fixed_strings("/dev/stdin", expected_pattern)
-        "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
+        "#{sed} | #{sed_end} | #{checker_with_regexp}|| #{sed} | #{sed_end} | #{checker_with_fixed}"
       end
 
       def check_belonging_group(user, group)

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.25.2"
+  VERSION = "1.25.3"
 end

data/wercker.yml

@@ -26,10 +26,6 @@ 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
@@ -38,30 +34,10 @@ build:
         name: Run rake spec:centos65
         code: 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: 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
@@ -73,8 +49,12 @@ build:
 
   after-steps:
     - script:
-        name: Run vagrant destroy
-        code: vagrant destroy --force
+        name: Run vagrant destroy centos65
+        code: vagrant destroy centos65 --force
+        cwd: $WORKING_DIR
+    - script:
+        name: Run vagrant destroy ubuntu1404
+        code: vagrant destroy ubuntu1404 --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.2
+  version: 1.25.3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler