cap_reserve 0.1.0 → 0.1.1

data/README.md

@@ -19,13 +19,13 @@ You must have a [maitre_d](https://github.com/winton/maitre_d) server running fi
 
     require 'cap_reserve'
 
-    task :setup_reserve do
+    task :reserve do
       ENV['RESERVE_ENV'] = 'staging'
       ENV['RESERVE_URL'] = 'http://localhost:3000'
-      reserve
+      maitre_d
    	end
 
-   	before "deploy", "setup_reserve"
+   	before "deploy", "reserve"
 
 Use It
 ------
@@ -38,15 +38,24 @@ Force the deploy even if reserved:
 
     cap deploy FORCE=1
 
+Destroy the reservation:
+
+    cap deploy DESTROY=1
+
+You can also reserve without deploying:
+
+    cap reserve RESERVE=10
+
 How it Works
 ------------
 
 The `reserve` cap task looks for the following `ENV` variables:
 
+    ENV['DESTROY']      # Destroy reservation
     ENV['FORCE']        # Force deploy
     ENV['RESERVE']      # Minutes to reserve environment
     ENV['RESERVE_ENV']  # Name of deploy environment
     ENV['RESERVE_URL']  # URL to your maitre_d server
     ENV['USER']         # Name of user
  
- In the example above, we use the `setup_reserve` cap task to set up these variables.
+ In the example above, we use the `setup_reserve` cap task to set up the `RESERVE_ENV` and `RESERVE_URL` variables.

data/cap_reserve.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "cap_reserve"
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ "Winton Welsh" ]
   s.email       = [ "mail@wintoni.us" ]
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.test_files = `cd #{root} && git ls-files -- {features,test,spec}/*`.split("\n")
 
   s.add_development_dependency "rspec", "~> 1.0"
-  
-  s.add_dependency "nestful", "= 0.0.7"
+
+  s.add_dependency "yajl-ruby", "= 1.0.0"
 end

data/lib/cap_reserve.rb

@@ -1,45 +1,71 @@
-gem "nestful", "= 0.0.7"
-require "nestful"
+gem 'yajl-ruby', '= 1.0.0'
+
+require 'open-uri'
+require 'uri'
+require 'yajl'
 
 $:.unshift File.dirname(__FILE__)
 
 Capistrano::Configuration.instance(:must_exist).load do 
 
   desc "Reserve environment using RESERVE=minutes"
-  task :reserve do
-    env, user, time, force, url =
-      ENV['RESERVE_ENV'], ENV['USER'], ENV['RESERVE'], ENV['FORCE'], ENV['RESERVE_URL']
+  task :maitre_d do
+    env, user, time, force, url, destroy =
+      ENV['RESERVE_ENV'], ENV['USER'], ENV['RESERVE'], ENV['FORCE'], ENV['RESERVE_URL'], ENV['DESTROY']
+
+    expires_to_string = lambda do |expires|
+      left = Time.at(expires) - Time.now
+      if left < 60
+        "#{left} seconds"
+      elsif left / 60 < 60
+        "#{sprintf "%.1f", left / 60} minutes"
+      else
+        "#{sprintf "%.1f", left / 60 / 60} hours"
+      end
+    end
+
+    get = lambda do |full_url, hash|
+      params = ''
+      hash.each do |k, v|
+        params << "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}&"
+      end
+      params.chop! # trailing &
+
+      puts "#{full_url}?#{params}"
+      json = open("#{full_url}?#{params}").read
+      Yajl::Parser.parse(json)
+    end
 
     create = lambda do |params|
       if time
-        Nestful.get("#{url}/reservations/create", :format => :json, :params => {
+        get.call("#{url}/reservations/create", {
           :environment => env, :user => user, :seconds => time.to_i * 60
         }.merge(params))
         puts "Reservation created: #{user}@#{env} for #{time.to_i} minutes"
-      elsif force
-        res = Nestful.get("#{url}/reservations/destroy", :params => { :environment => env }, :format => :json)
+      elsif destroy
+        res = get.call("#{url}/reservations/destroy", :environment => env)
         if res['status'] == 'reserved'
-          puts "Reservation destroyed: #{res['user']}@#{env} (#{(Time.at(res['expires']) - Time.now) / 60} minutes left)"
+          puts "Reservation destroyed: #{res['user']}@#{env} (#{expires_to_string.call Time.at(res['expires'])} left)"
         end
       end
     end
 
     if env && user
-      if force
+      if destroy
+        create.call({})
+      elsif force
         create.call(:force => true)
       else
-        res = Nestful.get("#{url}/reservations/show", :params => { :environment => env }, :format => :json)
+        res = get.call("#{url}/reservations/show", :environment => env)
         if res['status'] == 'reserved'
-          if res['user'] == user
-            create.call({})
-          else
-            puts "Reservation exists: #{res['user']}@#{env} for #{(Time.at(res['expires']) - Time.now) / 60} minutes"
-            exit 0
-          end
+          puts "Reservation exists: #{res['user']}@#{env} for #{expires_to_string.call Time.at(res['expires'])}"
+          exit 0
         else
           create.call({})
         end
       end
     end
+
+    exit
   end
 end

metadata

@@ -1,45 +1,63 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cap_reserve
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
-authors:
+authors: 
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-10-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70146890925900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
   prerelease: false
-  version_requirements: *70146890925900
-- !ruby/object:Gem::Dependency
-  name: nestful
-  requirement: &70146890925420 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 0.0.7
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70146890925420
+  version_requirements: *id002
 description: Uses a maitre_d server to reserve time on deploy environments.
-email:
+email: 
 - mail@wintoni.us
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -51,28 +69,37 @@ files:
 - spec/spec_helper.rb
 homepage: http://guthub.com/winton/cap_reserve
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Uses a maitre_d server to reserve time on deploy environments
-test_files:
+test_files: 
 - spec/cap_reserve_spec.rb
 - spec/spec_helper.rb