Merge pull request #11 from bkw/fixUiDir

remove superfluous subdir consol_ui

.kitchen.yml

@@ -23,3 +23,10 @@ suites:
   - name: default
     run_list:
       - recipe[consul::default]
+  - name: ui
+    run_list:
+      - recipe[consul::default]
+      - recipe[consul::ui]
+    attributes:
+        consul:
+           serve_ui: true

recipes/service.rb

@@ -14,7 +14,7 @@
 end
 
 if node[:consul][:serve_ui]
-  service_params = "#{service_params} -ui-dir #{node[:consul][:ui_dir]}/consul_ui -client #{node[:consul][:client_addr]}"
+  service_params = "#{service_params} -ui-dir #{node[:consul][:ui_dir]} -client #{node[:consul][:client_addr]}"
 end
 
 directory node[:consul][:config_dir]

recipes/ui.rb

@@ -19,6 +19,7 @@
 install_checksum = node[:consul][:checksums].fetch(install_version)
 
 ark 'consul_ui' do
+  name ""
   path node[:consul][:ui_dir]
   version node[:consul][:version]
   checksum install_checksum

test/integration/ui/serverspec/localhost/consul_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe file('/var/lib/consul/ui/index.html') do
+    it { should be_file }
+end
+
+describe command('wget -q -O- http://0.0.0.0:8500/ui/index.html') do
+  it { should return_exit_status 0 }
+  its(:stdout) { should == File.read('/var/lib/consul/ui/index.html') }
+end
+

test/integration/ui/serverspec/spec_helper.rb

@@ -0,0 +1,16 @@
+begin
+    require 'rspec/its'
+rescue LoadError
+    require 'rubygems/dependency_installer'
+    Gem::DependencyInstaller.new.install('rspec-its')
+    require 'rspec/its'
+end
+
+require 'serverspec'
+
+include SpecInfra::Helper::Exec
+include SpecInfra::Helper::DetectOS
+
+RSpec.configure do |c|
+  c.path = '/usr/local/bin:/sbin:/bin:/usr/bin'
+end