summaryrefslogtreecommitdiff
path: root/lib/chef_zero/server.rb
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-12-29 18:06:37 -0800
committerGitHub <noreply@github.com>2019-12-29 18:06:37 -0800
commitc8bf6efa66ff005ab87ff81c9a857ea0c6c1090e (patch)
tree3a25409c03ff3ac83f94e6e740145353d3e2c095 /lib/chef_zero/server.rb
parent435755ee68c14fd6d6f858e451e7afeee1610e6f (diff)
parentecad8fee4a946b337e60a4274de2b2c872c9e81b (diff)
downloadchef-zero-c8bf6efa66ff005ab87ff81c9a857ea0c6c1090e.tar.gz
Merge pull request #298 from chef/chefstyle
Apply Chefstyle
Diffstat (limited to 'lib/chef_zero/server.rb')
-rw-r--r--lib/chef_zero/server.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
index 0c60f78..2606dfb 100644
--- a/lib/chef_zero/server.rb
+++ b/lib/chef_zero/server.rb
@@ -176,7 +176,8 @@ module ChefZero
end
def local_mode_url
- raise "Port not yet set, cannot generate URL" unless port.kind_of?(Integer)
+ raise "Port not yet set, cannot generate URL" unless port.is_a?(Integer)
+
"chefzero://localhost:#{port}"
end
@@ -275,7 +276,7 @@ module ChefZero
true
rescue Errno::EADDRINUSE
ChefZero::Log.warn("Port #{port} not available")
- @server.listeners.each { |l| l.close }
+ @server.listeners.each(&:close)
@server.listeners.clear
false
end
@@ -305,7 +306,7 @@ module ChefZero
break
end
end
- if !@port
+ unless @port
raise Errno::EADDRINUSE,
"No port in :port range #{options[:port]} is available"
end
@@ -501,11 +502,13 @@ module ChefZero
else
cookbook_data = ChefData::CookbookData.to_hash(cookbook, name_version)
end
- raise "No version specified" if !cookbook_data[:version]
+ raise "No version specified" unless cookbook_data[:version]
+
data_store.create_dir(["organizations", org_name, cookbook_type], cookbook_data[:cookbook_name], :recursive)
data_store.set(["organizations", org_name, cookbook_type, cookbook_data[:cookbook_name], cookbook_data[:version]], FFI_Yajl::Encoder.encode(cookbook_data, pretty: true), :create)
cookbook_data.values.each do |files|
next unless files.is_a? Array
+
files.each do |file|
data_store.set(["organizations", org_name, "file_store", "checksums", file[:checksum]], get_file(cookbook, file[:path]), :create)
end
@@ -642,6 +645,7 @@ module ChefZero
def app
return @app if @app
+
router = RestRouter.new(endpoints)
router.not_found = NotFoundEndpoint.new