From 7d5439301652e818e3e18332c5eb6f64a8b07e54 Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Fri, 27 Feb 2015 15:00:12 -0600
Subject: [PATCH] Initial kilo updates

Change-Id: Ibe513aa48a8d89d28d0e0d689ea839f263dd9316
Partial-Bug: #1426424
---
 .gitignore                | 26 +++++++-------------------
 .rubocop.yml              | 24 +++++++++++++-----------
 Berksfile                 |  2 +-
 CHANGELOG.md              | 13 -------------
 Gemfile                   | 14 +++++++++-----
 metadata.rb               | 11 ++++++-----
 providers/swift_object.rb |  2 --
 spec/default_spec.rb      |  1 -
 8 files changed, 36 insertions(+), 57 deletions(-)
 delete mode 100644 CHANGELOG.md

diff --git a/.gitignore b/.gitignore
index dacd229..d7ee44a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,9 @@
-*~
-*#
-.#*
-\#*#
-.*.sw[a-z]
-*.un~
-pkg/
-
-# Berkshelf
-.vagrant
-berks-cookbooks/*
-Berksfile.lock
-
-# Bundler
-Gemfile.lock
-bin/
 .bundle/
-
+berks-cookbooks/
+.kitchen
+.vagrant
 .coverage/
-.kitchen/
-.kitchen.local.yml
+*.swp
+Berksfile.lock
+Vagrantfile
+Gemfile.lock
diff --git a/.rubocop.yml b/.rubocop.yml
index 6084b41..70ac649 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,19 +1,21 @@
-# Rubocop,  we're buddies and all,  but we're going to have to disagree on the following
-
 AllCops:
- Exclude:
-   - berks-cookbooks/**
-   - Guardfile
-
-Encoding:
-  Exclude:
+  Include:
+    - metadata.rb
     - Gemfile
-
-WordArray:
-  MinSize: 3
+    - attributes/**
+    - libraries/**
+    - providers/**
+    - recipes/**
+    - resources/**
+    - spec/**
+  Exclude:
+    - .cookbooks/**/*
+    - berks-cookbooks/**/*
+    - .bundle/**/*
 
 Encoding:
   Exclude:
+    - metadata.rb
     - Gemfile
 
 NumericLiterals:
diff --git a/Berksfile b/Berksfile
index ab60e37..967b9a7 100644
--- a/Berksfile
+++ b/Berksfile
@@ -1,3 +1,3 @@
-source 'https://supermarket.getchef.com'
+source "https://supermarket.chef.io"
 
 metadata
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index c5bcf3c..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,13 +0,0 @@
-openstack-client CHANGELOG
-==========================
-
-This file is used to list changes made in each version of the openstack-client cookbook.
-
-10.0.1
------
-- [Paul Czarkowski](https://twitter.com/pczarkowski) - Initial release of openstack-client
-
-- - -
-Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
-
-The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
diff --git a/Gemfile b/Gemfile
index ba076a3..6d8e06f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,15 @@
 source 'https://rubygems.org'
 
-gem 'berkshelf', '~> 3.1.5'
-gem 'chef', '~> 11.6'
-gem 'rake', '~> 10.0'
-gem 'rubocop', '~> 0.20'
-gem 'foodcritic'
+gem 'chef', '~> 11.18.6'
+gem 'json', '<= 1.7.7' # chef 11 dependency
+gem 'berkshelf', '~> 3.2.1'
+gem 'hashie', '~> 2.0'
 gem 'chefspec', '~> 4.0.0'
+gem 'rspec', '~> 3.0.0'
+gem 'foodcritic', '~> 4.0'
+gem 'rubocop', '~> 0.29.1'
+
+gem 'rake', '~> 10.0'
 gem 'test-kitchen'
 gem 'kitchen-vagrant'
 gem 'guard', '>= 2.6'
diff --git a/metadata.rb b/metadata.rb
index 4b7afc6..1aeba5a 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -5,9 +5,10 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com'
 license 'Apache2'
 description 'Library cookbook to interact with Openstack Clouds'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '10.0.1'
+version '11.0.0'
 
-supports 'ubuntu', '>= 12.04'
-%w(build-essential apt xml).each do |ckbk|
-  depends ckbk
-end
+supports 'ubuntu', '>= 14.04'
+
+depends 'apt', '~> 2.6.1'
+depends 'build-essential', '~> 2.1.3'
+depends 'xml', '~> 1.2.13'
diff --git a/providers/swift_object.rb b/providers/swift_object.rb
index 6d4fa0e..bfed9b5 100644
--- a/providers/swift_object.rb
+++ b/providers/swift_object.rb
@@ -40,7 +40,6 @@ def load_current_resource
 end
 
 action :create do
-
   f = Tempfile.new('download')
 
   f.binmode if new_resource.binmode
@@ -62,7 +61,6 @@ action :create do
 end
 
 action :create_if_missing do
-
   unless current_resource.exists
     action_create
     new_resource.updated_by_last_action(true)
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index bebcc5c..6636cdc 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -9,6 +9,5 @@ describe 'openstack-client::default' do
     it 'writes some chefspec code' do
       skip 'todo'
     end
-
   end
 end