capistrano-hivequeen 0.2.0 → 0.3.0

data/capistrano-hivequeen.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'capistrano-hivequeen'
-  s.version           = '0.2.0'
-  s.date              = '2011-10-03'
+  s.version           = '0.3.0'
+  s.date              = '2011-10-04'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

data/lib/capistrano/hivequeen.rb

@@ -5,6 +5,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   HiveQueen.endpoint = hivequeen_endpoint
   HiveQueen.project = application
   HiveQueen.logger = logger
+  HiveQueen.set_credentials!
 
   # Redefine stage tasks from multistage extension
   # Set the list of available stages
@@ -13,6 +14,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   set :default_stage, :staging
 
   set :repository, HiveQueen.repository
+  set :scm, :git
 
   # Load capistrano multi-stage extension
   require 'fileutils' # required until https://github.com/capistrano/capistrano-ext/commit/930ca840a0b4adad0ec53546790b3f5ffe726538 is released

data/lib/capistrano/hivequeen/server.rb

@@ -1,17 +1,18 @@
 # HTTP Client for Hive Queen environment configuration
-require 'open-uri'
 require 'json'
 require 'fileutils'
+require 'excon'
+require 'base64'
 
 # Special cases:
 # - environment not found
 # - environment not ready: fail
 class HiveQueen
   class << self
-    attr_accessor :endpoint, :logger, :project
+    attr_accessor :endpoint, :logger, :project, :username, :password
 
     def project_data
-      @project_data ||= fetch("/projects/#{project}")
+      @project_data ||= fetch("/projects/#{project}.json")
     end
 
     def environments
@@ -29,14 +30,43 @@ class HiveQueen
     def roles(env_id)
       env_id = env_id.to_sym
       @roles ||= {}
-      @roles[env_id] ||= fetch("/environments/#{env_id}")
+      @roles[env_id] ||= fetch("/environments/#{env_id}.json")
+    end
+
+    # Try to load credentials, or read them from ~/.hivequeen
+    def set_credentials!
+      @username, @password = File.read(credential_path).chomp.split(':')
+      raise unless username && password
+    rescue Errno::ENOENT, RuntimeError
+      puts "Could not read HiveQueen credentials from #{credential_path}."
+      puts "#{credential_path} should contain your username and password seperated by a colon"
+      puts "Run this command with your credentials:"
+      puts " $ echo username:password > #{credential_path}"
+      exit 1
     end
 
     protected
+    def credential_path
+      File.join(ENV['HOME'], '.hivequeen')
+    end
+
+    def connection
+      @connection ||= Excon.new(endpoint)
+    end
+
+    def auth_header
+      value = Base64.encode64([username, password] * ':').chomp
+      { 'Authorization' => "Basic #{value}" }
+    end
+
     def fetch(path)
-      url = endpoint + path + '.json'
+      url = "#{endpoint}#{path}"
       logger.trace "Fetching #{url}"
-      JSON.parse(open(url).read)
+      response = connection.get(:path => path, :headers => auth_header)
+      unless (200..299).include?(response.status)
+        raise "Request to #{url} returned #{response.status} status"
+      end
+      JSON.parse(response.body)
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-hivequeen
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Aaron Suggs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 -04:00
+date: 2011-10-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency