trackman 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trackman (0.2.90)
+    trackman (0.3.1)
       heroku (>= 2.26.2)
       json
       nokogiri

data/lib/trackman/configuration_handler.rb

@@ -7,26 +7,30 @@ module Trackman
 	  @@TRACKMAN_ERROR = 'TRACKMAN_ERROR_PAGE_URL'
 	  @@TRACKMAN_MAINTENANCE = 'TRACKMAN_MAINTENANCE_PAGE_URL'
 
-	  attr_accessor :configs, :heroku_version 
+	  attr_accessor :configs, :heroku_version, :options
 
-	  def initialize(configs, heroku_version)
-	  	self.configs = configs
-	  	self.heroku_version = heroku_version
+	  def initialize(heroku_version, options = {})
+	  	self.options = options
+      self.heroku_version = heroku_version
+      self.configs = get_configs
 	  end
 
-	  def setup
-	    unless is_heroku_valid
-	      raise SetupException, "your heroku version is too low, we recommend '~> 2.26' at least"
-	    else
-	      rename_configs
-	      add_configs
-	      puts "done! Thank you for using Trackman!"
-	    end
+    def setup
+	    raise SetupException, "Your heroku version is too low, trackman requires '~> 2.26'." unless is_heroku_valid
+      rename_configs
+      add_configs
+      puts "Done!"
 	  end
 
-	  def add_configs
-	    puts "overriding the required heroku configs #{@@MAINTENANCE} and #{@@ERROR}"
+    def get_configs
+      result = run "heroku config -s" do |option|
+        "heroku config -s #{option}"
+      end
+      Trackman::ConfigurationHandler.s_to_h(result)
+    end
+    
 
+	  def add_configs
 	    if configs.include?(@@TRACKMAN_ERROR) && configs.include?(@@TRACKMAN_MAINTENANCE)
 	      trackman_configs = {}
 	      [[@@TRACKMAN_ERROR, @@ERROR], [@@TRACKMAN_MAINTENANCE, @@MAINTENANCE]].each do |old_c, new_c|
@@ -36,7 +40,7 @@ module Trackman
 	      add = trackman_configs.map{|k,v| "#{k}=#{v}" }.join(' ')
 	      add_config add
 	    else
-	      raise SetupException, "cannot find trackman configuration, make sure trackman addon is installed"
+	      raise SetupException, "Can't find trackman configuration, make sure trackman addon is installed."
 	    end
 	  end
 
@@ -49,36 +53,45 @@ module Trackman
 	    add = Hash[bkp.map {|k, v| [k + "_bkp", v] }].map{|k,v| "#{k}=#{v}" }.select{|c| !configs.include? c }.join(' ')
 	    
 	    unless add.empty?
-	    	puts "backing configs to heroku..."
 	      add_config add
 	    end
 	  end
 
+    def self.s_to_h configs
+      new_configs = {}
+      configs.split(" ").each do |a|
+        key_val = a.split("=")
+        new_configs[key_val[0]] = key_val[1]
+      end
+      new_configs
+    end
+
+    def self.h_to_s configs
+      out = []
+      configs.each do |k,v|
+        out << k + "=" + v
+      end
+      out.join ' '
+    end
+
 		private
 		  def is_heroku_valid
 		  	Versionomy.parse(heroku_version) >= Versionomy.parse("2.26.2")
 		  end
 
 		  def add_config add
-		  	`heroku config:add #{add}`
+        run "heroku config:add #{add}" do |option|
+          "heroku config:add #{option} #{add}"
+        end
 		  end
 
-			def self.s_to_h configs
-				new_configs = {}
-				configs.split(" ").each do |a|
-					key_val = a.split("=")
-					new_configs[key_val[0]] = key_val[1]
-				end
-				new_configs
-			end
-
-			def self.h_to_s configs
-				out = []
-				configs.each do |k,v|
-					out << k + "=" + v
-				end
-				out.join ' '
-			end
+      def run command
+        command = yield("--app #{options[:app]}") unless self.options[:app].nil?
+        puts "exec: #{command}"
+        result = `#{command}`
+        raise "An error occured running the last command." if $? != 0
+        result
+      end
 	end
 
 	class SetupException < Exception

data/lib/trackman/version.rb

@@ -1,3 +1,3 @@
 module Trackman
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/rails_generators/trackman/templates/trackman.rake

@@ -9,9 +9,9 @@ namespace :trackman do
   end
 
   desc "Sets up the heroku configs required by Trackman"
-  task :setup do
-    configs = Trackman::ConfigurationHandler.s_to_h(`heroku config -s`)
+  task :setup, :app do |t, args|
+    
     heroku_version = Gem.loaded_specs["heroku"].version.to_s
-    Trackman::ConfigurationHandler.new(configs, heroku_version).setup
+    Trackman::ConfigurationHandler.new(heroku_version, app: args[:app]).setup
   end
 end

data/spec/configuration_handler_spec.rb

@@ -1,83 +1,88 @@
 require 'spec_helper'
 
-describe ConfigurationHandler do
-  before :each do
-    module Trackman
-    	class ConfigurationHandler
-			  def add_config add	
-		  		self.configs = configs.merge(ConfigurationHandler.s_to_h(add))
-		  	end
-    	end
-    end
+class TestConfigurationHandler < Trackman::ConfigurationHandler
+  def get_configs
+    {
+      "TRACKMAN_MAINTENANCE_PAGE_URL" => "\"en_US.UTF-8\"",
+      "TRACKMAN_URL" => "\"url\"",
+      "TRACKMAN_ERROR_PAGE_URL" => "\"error_page_url\"",
+      "SOME_CONFIG" => "\"url\""
+    }
+  end
+  attr_accessor :heroku_configs
+
+  def add_config add
+    self.heroku_configs = (heroku_configs || {}).merge(ConfigurationHandler.s_to_h(add))
   end
 
-	it "should create heroku configs" do
-		configs = {"TRACKMAN_MAINTENANCE_PAGE_URL" => "\"en_US.UTF-8\"",
-						"TRACKMAN_URL" => "\"url\"",
-						"TRACKMAN_ERROR_PAGE_URL" => "\"error_page_url\"",
-						"SOME_CONFIG" => "\"url\""
-					}
+  def run command
+    puts "exec: #{command}"
+  end
+end
 
-		config_handler= ConfigurationHandler.new(configs, "2.26.2")
-		config_handler.setup
-		config_hash = config_handler.configs
+describe ConfigurationHandler do
+  before :each do 
+    @config = TestConfigurationHandler.new "2.26.2"
+  end
 
+	it "creates heroku configs" do
+		
+		@config.setup
+		
+    config_hash = @config.heroku_configs
 
 		config_hash.should include("ERROR_PAGE_URL")
-		config_hash.should include("MAINTENANCE_PAGE_URL")
+    config_hash.should include("MAINTENANCE_PAGE_URL")
 		config_hash["ERROR_PAGE_URL"].should == "\"error_page_url\""
 		config_hash["MAINTENANCE_PAGE_URL"].should == "\"en_US.UTF-8\""
 	end
 
-	it "should raise an error if a configuration is missing" do
-		configs = {"TRACKMANw_MAINTENANCE_PAGE_URL" => "\"en_US.UTF-8\"",
-											"TRACKMANw_URL" => "\"url\"",
-											"TRACKMANw_ERROR_PAGE_URL" => "\"error_page_url\""
-										}
+	it "raises an error if a configuration is missing" do
+    @config.configs = {
+      "TRACKMANw_MAINTENANCE_PAGE_URL" => "\"en_US.UTF-8\"",
+			"TRACKMANw_URL" => "\"url\"",
+			"TRACKMANw_ERROR_PAGE_URL" => "\"error_page_url\""
+		}
 		
-		config_handler = ConfigurationHandler.new(configs, "2.26.2") 
-		lambda{ config_handler.setup }.should raise_error(Trackman::SetupException, "cannot find trackman configuration, make sure trackman addon is installed")
+		lambda{ @config.setup }.should raise_error(Trackman::SetupException)
 	end
 
-	it "should raise an error if trackman version is bad" do
-		config_handler = ConfigurationHandler.new(@configs, "2.22.2") 
-		lambda{ config_handler.setup }.should raise_error(Trackman::SetupException, "your heroku version is too low, we recommend '~> 2.26' at least")
+	it "raises an error if trackman version is bad" do
+		@config.heroku_version = "2.22.2" 
+
+		lambda{ @config.setup }.should raise_error(Trackman::SetupException)
 	end
 
-	it "should backup configs when they already exist and add the new ones" do
-		configs = {"TRACKMAN_MAINTENANCE_PAGE_URL" => "\"en_US.UTF-8\"",
+	it "backups configs when they already exist and add the new ones" do
+		@config.configs = {"TRACKMAN_MAINTENANCE_PAGE_URL" => "\"en_US.UTF-8\"",
 								"TRACKMAN_URL" => "\"url\"",
 								"TRACKMAN_ERROR_PAGE_URL" => "\"error_page_url\"",
 								"MAINTENANCE_PAGE_URL" => "\"en_US.UTF-8_old\"",
 								"SOME_CONFIG" => "\"url\"",
 								"ERROR_PAGE_URL" => "\"error_page_url_old\""
 							}
-		config_handler = ConfigurationHandler.new(configs, "2.26.2")
-		config_handler.setup
-		config_hash = config_handler.configs
+		@config.setup
 
-		puts config_hash
 
-		config_hash["ERROR_PAGE_URL_bkp"].should == "\"error_page_url_old\""
-		config_hash["MAINTENANCE_PAGE_URL_bkp"].should == "\"en_US.UTF-8_old\""
-		config_hash["ERROR_PAGE_URL"].should == "\"error_page_url\""
-		config_hash["MAINTENANCE_PAGE_URL"].should == "\"en_US.UTF-8\""
+		@config.heroku_configs["ERROR_PAGE_URL_bkp"].should == "\"error_page_url_old\""
+		@config.heroku_configs["MAINTENANCE_PAGE_URL_bkp"].should == "\"en_US.UTF-8_old\""
+		@config.heroku_configs["ERROR_PAGE_URL"].should == "\"error_page_url\""
+		@config.heroku_configs["MAINTENANCE_PAGE_URL"].should == "\"en_US.UTF-8\""
 	end
 
-	it "should not backup configs when they do not exist" do
-		configs = {"TRACKMAN_MAINTENANCE_PAGE_URL" => "\"en_US.UTF-8\"",
+	it "does not backup configs when they do not exist" do
+		@config.configs = {"TRACKMAN_MAINTENANCE_PAGE_URL" => "\"en_US.UTF-8\"",
 								"TRACKMAN_URL" => "\"url\"",
 								"TRACKMAN_ERROR_PAGE_URL" => "\"error_page_url\"",
 								"SOME_CONFIG" => "\"url\""
 							}
-		config_handler = ConfigurationHandler.new(configs, "2.26.2")
-
-		config_handler.setup
-		config_hash = config_handler.configs
+		
+		@config.setup
+		
 
-		config_hash.keys.should_not include("ERROR_PAGE_URL_bkp")
-		config_hash.keys.should_not include("MAINTENANCE_PAGE_URL_bkp")
-		config_hash["ERROR_PAGE_URL"].should == "\"error_page_url\""
-		config_hash["MAINTENANCE_PAGE_URL"].should ==  "\"en_US.UTF-8\""
+		@config.heroku_configs.keys.should_not include("ERROR_PAGE_URL_bkp")
+		@config.heroku_configs.keys.should_not include("MAINTENANCE_PAGE_URL_bkp")
+		@config.heroku_configs["ERROR_PAGE_URL"].should == "\"error_page_url\""
+		@config.heroku_configs["MAINTENANCE_PAGE_URL"].should ==  "\"en_US.UTF-8\""
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackman
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client