summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2016-05-09 20:12:39 -0700
committerTim Smith <tsmith@chef.io>2017-02-23 12:55:16 -0800
commit6cab24734fc11b0c4f91211147f5785dd458bb80 (patch)
treeda902db54158b439740731b1cc0721b56253d0b6
parentbc969d5c54ac859f7da027d3372a06608d35ab0b (diff)
downloadohai-6cab24734fc11b0c4f91211147f5785dd458bb80.tar.gz
Chefstyle fixes and fix a bad hash
: vs. => was killing the spec
-rw-r--r--lib/ohai/mixin/do_metadata.rb10
-rw-r--r--lib/ohai/plugins/digital_ocean.rb8
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/ohai/mixin/do_metadata.rb b/lib/ohai/mixin/do_metadata.rb
index ec4a08a8..ef652c1d 100644
--- a/lib/ohai/mixin/do_metadata.rb
+++ b/lib/ohai/mixin/do_metadata.rb
@@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-require 'net/http'
-require 'socket'
+require "net/http"
+require "socket"
module Ohai
module Mixin
@@ -24,7 +24,7 @@ module Ohai
DO_METADATA_ADDR = "169.254.269.254" unless defined?(DO_METADATA_ADDR)
DO_METADATA_URL = "/metadata/v1.json" unless defined?(DO_METADATA_URL)
- def can_metadata_connect?(addr, port, timeout=2)
+ def can_metadata_connect?(addr, port, timeout = 2)
t = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
saddr = Socket.pack_sockaddr_in(port, addr)
connected = false
@@ -32,7 +32,7 @@ module Ohai
begin
t.connect_nonblock(saddr)
rescue Errno::EINPROGRESS
- r,w,e = IO::select(nil,[t],nil,timeout)
+ r, w, e = IO.select(nil, [t], nil, timeout)
if !w.nil?
connected = true
else
@@ -51,7 +51,7 @@ module Ohai
end
def http_client
- Net::HTTP.start(DO_METADATA_ADDR).tap {|h| h.read_timeout = 6}
+ Net::HTTP.start(DO_METADATA_ADDR).tap { |h| h.read_timeout = 6 }
end
def fetch_metadata()
diff --git a/lib/ohai/plugins/digital_ocean.rb b/lib/ohai/plugins/digital_ocean.rb
index f64f1760..a9162a2f 100644
--- a/lib/ohai/plugins/digital_ocean.rb
+++ b/lib/ohai/plugins/digital_ocean.rb
@@ -15,8 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-require 'ohai/mixin/do_metadata'
-require 'yaml'
+require "ohai/mixin/do_metadata"
+require "yaml"
Ohai.plugin(:DigitalOcean) do
include Ohai::Mixin::DOMetadata
@@ -30,7 +30,7 @@ Ohai.plugin(:DigitalOcean) do
def has_do_init?
if File.exist?(DO_CLOUD_INIT_FILE)
datasource = YAML.load_file(DO_CLOUD_INIT_FILE)
- if datasource['datasource_list'].include?("DigitalOcean")
+ if datasource["datasource_list"].include?("DigitalOcean")
Ohai::Log.debug("digital_ocean plugin: has_do_init? == true")
true
end
@@ -44,7 +44,7 @@ Ohai.plugin(:DigitalOcean) do
return true if hint?("digital_ocean")
if has_do_init?
- return true if can_metadata_connect?(Ohai::Mixin::DOMetadata::DO_METADATA_ADDR,80)
+ return true if can_metadata_connect?(Ohai::Mixin::DOMetadata::DO_METADATA_ADDR, 80)
end
end