Merge pull request #6 from socrata-cookbooks/jdh-custom-resources

Update APT and convert to custom resources
socrata-cookbooks · Mar 4, 2016 · 9cc54e2 · 9cc54e2
2 parents dbd3dba + 0b83bd8
commit 9cc54e2
Show file tree

Hide file tree

Showing 62 changed files with 1,224 additions and 1,504 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -25,6 +25,6 @@ suites:
   - name: default
     run_list:
       - recipe[x2go-client]
-  - name: uninstall
+  - name: remove
     run_list:
-      - recipe[x2go-client_test::uninstall]
+      - recipe[x2go-client_test::remove]
diff --git a/Berksfile b/Berksfile
@@ -4,4 +4,13 @@ source 'https://supermarket.chef.io'
 
 metadata
 
-cookbook 'x2go-client_test', path: 'test/fixtures/cookbooks/x2go-client_test'
+group :unit do
+  cookbook 'resource_x2go_client_test',
+           path: 'spec/support/cookbooks/resource_x2go_client_test'
+  cookbook 'resource_x2go_client_app_test',
+           path: 'spec/support/cookbooks/resource_x2go_client_app_test'
+end
+
+group :integration do
+  cookbook 'x2go-client_test', path: 'test/fixtures/cookbooks/x2go-client_test'
+end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
 X2go Client Cookbook CHANGELOG
 ==============================
 
-v?.?.? (????-??-??)
--------------------
+Unreleased
+----------
+- Update apt dependency from 2.x to 3.x
+- Convert everything to Chef 12.5 custom resources
 
 v0.2.0 (2015-09-28)
 -------------------

diff --git a/Gemfile b/Gemfile
@@ -23,6 +23,7 @@ group :test do
   gem 'test-kitchen'
   gem 'kitchen-vagrant'
   gem 'winrm-transport'
+  gem 'winrm-fs'
   gem 'kitchen-docker'
   gem 'kitchen-localhost'
 end

diff --git a/libraries/matchers.rb b/libraries/matchers.rb
@@ -19,19 +19,16 @@
 #
 
 if defined?(ChefSpec)
-  [:x2go_client, :x2go_client_app].each do |m|
-    ChefSpec.define_matcher(m)
-  end
-
-  [:create, :remove].each do |a|
-    define_method("#{a}_x2go_client") do |name|
-      ChefSpec::Matchers::ResourceMatcher.new(:x2go_client, a, name)
-    end
-  end
+  {
+    x2go_client: %i(create remove),
+    x2go_client_app: %i(install remove)
+  }.each do |matcher, actions|
+    ChefSpec.define_matcher(matcher)
 
-  [:install, :remove].each do |a|
-    define_method("#{a}_x2go_client_app") do |name|
-      ChefSpec::Matchers::ResourceMatcher.new(:x2go_client_app, a, name)
+    actions.each do |action|
+      define_method("#{action}_#{matcher}") do |name|
+        ChefSpec::Matchers::ResourceMatcher.new(matcher, action, name)
+      end
     end
   end
 end
diff --git a/libraries/provider_x2go_client_app.rb b/libraries/provider_x2go_client_app.rb
diff --git a/libraries/provider_x2go_client_app_debian.rb b/libraries/provider_x2go_client_app_debian.rb
diff --git a/libraries/provider_x2go_client_app_fedora.rb b/libraries/provider_x2go_client_app_fedora.rb
diff --git a/libraries/provider_x2go_client_app_mac_os_x.rb b/libraries/provider_x2go_client_app_mac_os_x.rb