specinfra 2.70.2 → 2.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9f1e31f2b84909f7eda6a32e53c04f204af4f95
-  data.tar.gz: f0abfe1a2001257c1bcef67222524f69200aa874
+  metadata.gz: 22c27e74d4f222ca0d10de2f17c3737876fb76f7
+  data.tar.gz: 937890d3ec6635987cd1cc1bcbacd8f0daee7442
 SHA512:
-  metadata.gz: 824139d2535ef1fff566a13acd4544075919155425b32dab07dfb79d49ca9d06efd8fe147dc26977a60e721b7c799a1c66f58d1f0fbddd1986ac8a16e76ea4a7
-  data.tar.gz: 879cc5284d2722a6529c28d456ccd66842ba0c9eec2602cf2e871d3718a042215e1cf58bab448c9df6562a09c35f9dc3c9dbf7912c3be20142e4bafcba7bd102
+  metadata.gz: c848931100720913bf72a96a7c098aa920b14045c06936917e8f1fcaacbefc5f8f060acc57299976dbac305222f8ef4ef2ffdb346413737168f538589e61927c
+  data.tar.gz: 4fdf5a547e08fbf11fbcd50de361092ceaa8e989d604146b3f9acc650b2fd72fe7cc34de90d8509e2473b3eeeba55bc58a9bed55ea1b6c426ac6c40cf6704677

data/lib/specinfra/helper/os.rb

@@ -4,32 +4,10 @@ module Specinfra
   module Helper
     module Os
       def os
-        property[:os] = {} if ! property[:os]
-        if ! property[:os].include?(:family)
-          property[:os] = detect_os
-        end
-        property[:os]
-      end
-
-      private
-      def detect_os
-        return Specinfra.configuration.os if Specinfra.configuration.os
-
-        backend = Specinfra.configuration.backend
-        if backend == :cmd || backend == :winrm
-          return { :family => 'windows', :release => nil, :arch => nil }
-        end
-
-        Specinfra::Helper::DetectOs.subclasses.each do |c|
-          res = c.detect
-          if res
-            res[:arch] ||= Specinfra.backend.run_command('uname -m').stdout.strip
-            return res
-          end
-        end
-        raise NotImplementedError, "Specinfra failed os detection."
+        property[:os] = Specinfra.configuration.os ?
+          Specinfra.configuration.os :
+          Specinfra.backend.os_info
       end
     end
   end
 end
-

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.70.2"
+  VERSION = "2.71.0"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -113,6 +113,7 @@ describe 'os' do
     # clear os information cache
     property[:os] = nil
     Specinfra.configuration.instance_variable_set(:@os, nil)
+    Specinfra.backend.instance_variable_set(:@os_info, nil)
   end
 
   context 'test ubuntu with lsb_release command' do
@@ -185,4 +186,3 @@ EOF
     end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.70.2
+  version: 2.71.0
 platform: ruby
 authors:
 - Gosuke Miyashita