cfoundry 2.3.1 → 2.3.2

data/Rakefile

@@ -1,8 +1,10 @@
 require "rake"
 require "rspec/core/rake_task"
+Dir.glob("lib/tasks/**/*").sort.each { |ext| load(ext) }
 
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "cfoundry/version"
 
+
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec

data/lib/cfoundry/baseclient.rb

@@ -134,8 +134,6 @@ module CFoundry
 
     def handle_response(response, options, request)
       if status_is_successful?(response[:status].to_i)
-        uaa.delete_user(options[:params][:user_delete]) if options[:params] && options[:params][:user_delete]
-
         handle_successful_response(response, options)
       else
         handle_error_response(response, request)

data/lib/cfoundry/v2/user.rb

@@ -63,8 +63,8 @@ module CFoundry
       end
 
       def delete! (options = {})
-        options[:user_delete] = guid
         super (options)
+        @client.base.uaa.delete_user(guid)
       end
     end
   end

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "2.3.1".freeze
+  VERSION = "2.3.2".freeze
 end

data/lib/tasks/gem_release.rake

@@ -0,0 +1,41 @@
+require 'active_support/core_ext'
+
+namespace :gem do
+  desc "Bump gem version, push to RubyGems, push to Github, add release notes"
+  task :release, [:version] do |_, args|
+    version = args[:version] || 'rc'
+    old_version = gem_version
+
+    sh! "gem bump --version #{version} --no-commit"
+
+    print_with_purpose "Bumping to version #{gem_version}"
+    generate_release_notes(old_version)
+    sh!("git commit -m 'Bumping to version #{gem_version}.'")
+    sh!("git push")
+    sh!("gem release --tag")
+  end
+
+  private
+  def generate_release_notes(old_version)
+    print_with_purpose "Generating release notes..."
+    file_name = "release_#{gem_version}"
+    sh!("anchorman notes --name=#{file_name} --from=v#{old_version}")
+    sh!("git add release_notes")
+  end
+
+  def sh!(cmd)
+    `#{cmd}`
+    raise "borked with #{$?}" unless $?.success?
+  end
+
+  def print_with_purpose(text)
+    puts "\033[34m#{text}\033[0m"
+  end
+
+  def gem_version
+    silence_warnings do
+      load "lib/cfoundry/version.rb"
+    end
+    Gem::Specification.load("cfoundry.gemspec").version.to_s
+  end
+end

data/spec/cfoundry/v2/user_spec.rb

@@ -16,7 +16,17 @@ module CFoundry
           it "also removes the user from uaa" do
             CFoundry::UAAClient.any_instance.should_receive(:delete_user)
 
-            subject.delete!({})
+            subject.delete!
+          end
+        end
+
+        describe "when cloud controller was unable to delete the user" do
+          before do
+            client.base.stub(:delete).and_raise(CFoundry::APIError)
+          end
+
+          it "allows the exception to bubble up" do
+            expect{ subject.delete! }.to raise_error(CFoundry::APIError)
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -299,6 +299,7 @@ files:
 - lib/cfoundry/version.rb
 - lib/cfoundry/zip.rb
 - lib/cfoundry.rb
+- lib/tasks/gem_release.rake
 - vendor/errors/README.md
 - vendor/errors/v1.yml
 - vendor/errors/v2.yml