cap_reserve 0.1.2 → 0.1.3

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.2'
+  s.version     = '0.1.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ "Winton Welsh" ]
   s.email       = [ "mail@wintoni.us" ]

data/lib/cap_reserve.rb

@@ -10,67 +10,67 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "Reserve environment using RESERVE=minutes"
   task :maitre_d do
-    env, user, time, force, url, destroy =
-      ENV['RESERVE_ENV'], ENV['USER'], ENV['RESERVE'], ENV['FORCE'], ENV['RESERVE_URL'], ENV['DESTROY']
+    begin
+      env, user, time, force, url, destroy =
+        ENV['RESERVE_ENV'], ENV['USER'], ENV['RESERVE'], ENV['FORCE'], ENV['RESERVE_URL'], ENV['DESTROY']
 
-    help = <<-HELP
-FORCE=1 to deploy anyway
-DESTROY=1 to deploy and destroy reservation
+      help = <<-HELP
+  FORCE=1 to deploy anyway
+  DESTROY=1 to deploy and destroy reservation
 HELP
 
-    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"
+      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
-    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 &
+      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
+        json = open("#{full_url}?#{params}").read
+        Yajl::Parser.parse(json)
+      end
 
-    create = lambda do |params|
-      if time
-        get.call("#{url}/reservations/create", {
-          :environment => env, :user => user, :seconds => time.to_i * 60
-        }.merge(params))
-        puts "\n\e[32mReservation created\e[0m: \e[33m#{user}@#{env}\e[0m for \e[33m#{time.to_i} minutes\e[0m\n\n"
-      elsif destroy
-        res = get.call("#{url}/reservations/destroy", :environment => env)
-        if res['status'] == 'reserved'
-          puts "\n\e[32mReservation destroyed\e[0m: \e[33m#{res['user']}@#{env}\e[0m (\e[33m#{expires_to_string.call Time.at(res['expires'])}\e[0m left)\n\n"
+      create = lambda do |params|
+        if time
+          get.call("#{url}/reservations/create", {
+            :environment => env, :user => user, :seconds => time.to_i * 60
+          }.merge(params))
+          puts "\n\e[32mReservation created\e[0m: \e[33m#{user}@#{env}\e[0m for \e[33m#{time.to_i} minutes\e[0m\n\n"
+        elsif destroy
+          res = get.call("#{url}/reservations/destroy", :environment => env)
+          if res['status'] == 'reserved'
+            puts "\n\e[32mReservation destroyed\e[0m: \e[33m#{res['user']}@#{env}\e[0m (\e[33m#{expires_to_string.call Time.at(res['expires'])}\e[0m left)\n\n"
+          end
         end
       end
-    end
 
-    if env && user
-      if destroy
-        create.call({})
-      elsif force
-        create.call(:force => true)
-      else
-        res = get.call("#{url}/reservations/show", :environment => env)
-        if res['status'] == 'reserved'
-          puts "\n\e[31mReservation exists\e[0m: \e[33m#{res['user']}@#{env}\e[0m for \e[33m#{expires_to_string.call Time.at(res['expires'])}\e[0m\n#{help}\n"
-          exit 0
-        else
+      if env && user
+        if destroy
           create.call({})
+        elsif force
+          create.call(:force => true)
+        else
+          res = get.call("#{url}/reservations/show", :environment => env)
+          if res['status'] == 'reserved'
+            puts "\n\e[31mReservation exists\e[0m: \e[33m#{res['user']}@#{env}\e[0m for \e[33m#{expires_to_string.call Time.at(res['expires'])}\e[0m\n#{help}\n"
+            exit 0
+          else
+            create.call({})
+          end
         end
       end
+    rescue Exception => e
     end
-
-    exit
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap_reserve
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Winton Welsh