trackman 0.1.9 → 0.2.0

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
 .bundle
 Gemfile.lock
-pkg/*
+pkg/*
+*.orig

data/Gemfile.lock

@@ -12,6 +12,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.8)
+    blockenspiel (0.4.5)
     diff-lcs (1.1.3)
     excon (0.14.1)
     heroku (2.28.2)
@@ -48,11 +49,15 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
+    versionomy (0.4.4)
+      blockenspiel (>= 0.4.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   rspec
+  rspec-mocks
   sprockets
   trackman!
+  versionomy

data/README.md

@@ -36,7 +36,8 @@ This will add trackman.rake to lib/tasks/
 ```console
 rake trackman:setup
 ```
-Sets up your initial configuration.
+This sets your initial heroku configurations and ensures that when your app is down or in maintenance your pages will be requested by heroku.
+If you have maintenance or error pages setup for heroku, we will back them up in a configuration before we override them.  
 
 ### Optional
 ```console

data/lib/trackman/configuration_handler.rb

@@ -0,0 +1,86 @@
+require 'versionomy'
+
+module Trackman
+	class ConfigurationHandler
+		@@ERROR = 'ERROR_PAGE_URL'
+	  @@MAINTENANCE = 'MAINTENANCE_PAGE_URL'
+	  @@TRACKMAN_ERROR = 'TRACKMAN_ERROR_PAGE_URL'
+	  @@TRACKMAN_MAINTENANCE = 'TRACKMAN_MAINTENANCE_PAGE_URL'
+
+	  attr_accessor :configs, :heroku_version 
+
+	  def initialize(configs, heroku_version)
+	  	self.configs = configs
+	  	self.heroku_version = heroku_version
+	  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
+	  end
+
+	  def add_configs
+	    puts "overriding the required heroku configs #{@@MAINTENANCE} and #{@@ERROR}"
+
+	    if configs.include?(@@TRACKMAN_ERROR) && configs.include?(@@TRACKMAN_MAINTENANCE)
+	      trackman_configs = {}
+	      [[@@TRACKMAN_ERROR, @@ERROR], [@@TRACKMAN_MAINTENANCE, @@MAINTENANCE]].each do |old_c, new_c|
+	        trackman_configs[new_c] = configs[old_c]
+	      end
+
+	      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"
+	    end
+	  end
+
+	  def rename_configs
+	    bkp = {}
+	    [@@ERROR, @@MAINTENANCE].each do |c|
+	      bkp[c] = configs[c] if configs.include? c
+	    end
+	   
+	    add = Hash[bkp.map {|k, v| [k + ".bkp", v] }].map{|k,v| "#{k}=#{v}" }.select{|c| !configs.include? c }.join(' ')
+	    
+	    unless add.empty?
+	    	puts "backuping configs to heroku..."
+	      add_config add
+	    end
+	  end
+
+		private
+		  def is_heroku_valid
+		  	Versionomy.parse(heroku_version) >= Versionomy.parse("2.26.2")
+		  end
+
+		  def add_config add
+		  	`heroku config:add #{add}`
+		  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
+	end
+
+	class SetupException < Exception
+	end
+end

data/lib/trackman/version.rb

@@ -1,3 +1,3 @@
 module Trackman
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/lib/trackman.rb

@@ -4,7 +4,8 @@ require 'tasks'
 
 module Trackman
   autoload :RackMiddleware, 'trackman/rack_middleware'
-  autoload :Assets, 'trackman/assets'  
+  autoload :Assets, 'trackman/assets'
+  autoload :ConfigurationHandler, 'trackman/configuration_handler'
 end 
 
 autoload :Debugger, 'trackman/debugger'

data/rails_generators/trackman/templates/trackman.rake

@@ -1,62 +1,17 @@
 require 'rest-client'
+require 'trackman'
 
 namespace :trackman do
-  ERROR = 'ERROR_PAGE_URL'
-  MAINTENANCE = 'MAINTENANCE_PAGE_URL'
-  TRACKMAN_ERROR = 'TRACKMAN_ERROR_PAGE_URL'
-  TRACKMAN_MAINTENANCE = 'TRACKMAN_MAINTENANCE_PAGE_URL'
-
   desc "Syncs your assets with the server, this is what gets executed when you deploy to heroku."
-  task :sync => :environment do
-    require 'trackman'
+  task :sync => :environment do 
     RestClient.log = Logger.new(STDOUT) if Debugger.debug_mode?
     Trackman::Assets::Asset.sync
   end
 
   desc "Sets up the heroku configs required by Trackman" 
   task :setup do
-    heroku_version = `heroku version`
-    if heroku_version !~ /^[2-9]\.[2-9]/
-      puts "your heroku version is too low, we recommend '~> 2.26' at least"
-    else
-      configs = `heroku config -s` 
-      rename_configs configs
-      add_configs configs
-      puts "done! Thank you for using Trackman!"
-    end
+    configs = ConfigurationHandler.s_to_h(`heroku config -s`)
+    heroku_version = `heroku -v`[/[\d]*\.[\d]*.[\d]*/]
+    ConfigurationHandler.new(configs, heroku_version).setup
   end 
-
-  def rename_configs configs
-    bkp = {}
-
-    [ERROR, MAINTENANCE].each do |c|
-      bkp[c] = extract_config_value(configs, c) if configs.include? c
-    end
-    
-    add = Hash[bkp.map {|k, v| [k + ".bkp", v] }].map{|k,v| "#{k}=#{v}" }.join(' ')
-    
-    `heroku config:add #{add}`
-    puts "backuping configs to heroku...\n running heroku config:add #{add}"
-  end
-
-  def add_configs configs
-    puts "overriding the required heroku configs #{MAINTENANCE} and #{ERROR}"
-
-    if configs.include?(TRACKMAN_ERROR) && configs.include?(TRACKMAN_MAINTENANCE)
-      trackman_configs = {}
-      [[TRACKMAN_ERROR, ERROR], [TRACKMAN_MAINTENANCE, MAINTENANCE]].each do |old_c, new_c|
-        trackman_configs[new_c] = extract_config_value(configs, old_c)
-      end
-
-      add = trackman_configs.map{|k,v| "#{k}=#{v}" }.join(' ')
-      `heroku config:add #{add}`
-      puts "running heroku config:add #{add}"
-    else
-      puts "cannot find trackman configuration, make sure trackman addon is installed"
-    end
-  end
-
-  def extract_config_value configs, name
-    configs[/#{name}=.+$/][/[^=]+$/]
-  end
 end

data/spec/configuration_handler_spec.rb

@@ -0,0 +1,83 @@
+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
+  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\""
+					}
+
+		config_handler= ConfigurationHandler.new(configs, "2.26.2")
+		config_handler.setup
+		config_hash = config_handler.configs
+
+
+		config_hash.should include("ERROR_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\""
+										}
+		
+		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")
+	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")
+	end
+
+	it "should backup configs when they already exist and add the new ones" do
+		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
+
+		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\""
+	end
+
+	it "should not backup configs when they do not exist" do
+		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_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\""
+	end
+end

data/spec/helpers/app_creator.rb

@@ -21,6 +21,10 @@ class AppCreator
   end
 
   def self.reset
+    RemoteAsset.all.each do |a|
+      a.delete
+    end
+
     @@config.each do |k,v|
       RemoteAsset.send(:class_variable_set, k, v)
     end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 require 'trackman'
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
@@ -19,4 +20,5 @@ RemoteAsset = Trackman::Assets::RemoteAsset unless defined?(RemoteAsset)
 
 PathResolver = Trackman::Assets::Components::PathResolver unless defined?(PathResolver)
 Rails32PathResolver = Trackman::Assets::Components::Rails32PathResolver unless defined?(Rails32PathResolver)
-RailsPathResolver = Trackman::Assets::Components::RailsPathResolver unless defined?(RailsPathResolver)
+RailsPathResolver = Trackman::Assets::Components::RailsPathResolver unless defined?(RailsPathResolver)
+ConfigurationHandler = Trackman::ConfigurationHandler unless defined?(ConfigurationHandler)

data/trackman.gemspec

@@ -26,4 +26,6 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency "rspec"
   s.add_development_dependency "sprockets"
+  s.add_development_dependency "rspec-mocks"
+  s.add_development_dependency "versionomy"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackman
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -124,6 +124,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: versionomy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Trackman hosts your maintenances and app-down pages (503s) and lets you
   keep them in your current development environment so that you can focus on delivering
   and not configuring.
@@ -147,7 +179,6 @@ files:
 - lib/trackman/assets/asset.rb
 - lib/trackman/assets/components.rb
 - lib/trackman/assets/components/asset_factory.rb
-- lib/trackman/assets/components/asset_factory.rb.orig
 - lib/trackman/assets/components/composite_asset.rb
 - lib/trackman/assets/components/conventions.rb
 - lib/trackman/assets/components/diffable.rb
@@ -162,6 +193,7 @@ files:
 - lib/trackman/assets/errors/config_not_found_error.rb
 - lib/trackman/assets/html_asset.rb
 - lib/trackman/assets/remote_asset.rb
+- lib/trackman/configuration_handler.rb
 - lib/trackman/debugger.rb
 - lib/trackman/rack_middleware.rb
 - lib/trackman/railtie.rb
@@ -172,6 +204,7 @@ files:
 - spec/asset_factory_spec.rb
 - spec/asset_spec.rb
 - spec/composite_asset_spec.rb
+- spec/configuration_handler_spec.rb
 - spec/css_asset_spec.rb
 - spec/diffable_spec.rb
 - spec/fixtures/rails2311/fully-loaded/README
@@ -409,6 +442,7 @@ files:
 - spec/helpers/act_like_rails2311.rb
 - spec/helpers/act_like_rails32.rb
 - spec/helpers/app_creator.rb
+- spec/helpers/config_helper.rb
 - spec/helpers/fakable_pathman_tester.rb
 - spec/html_asset_spec.rb
 - spec/paths/pathman_spec.rb
@@ -470,7 +504,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Client version of the Trackman addon on Heroku

data/lib/trackman/assets/components/asset_factory.rb.orig

@@ -1,54 +0,0 @@
-module Trackman
-  module Assets
-    module Components
-      module AssetFactory
-        def create attributes = {}
-          path = attributes[:path]
-
-          if File.extname(path) == '.html'
-            parent = HtmlAsset
-          elsif File.extname(path) == '.css'
-            parent = CssAsset 
-          else
-            parent = Asset
-          end 
-
-          instance = parent.new attributes
-<<<<<<< HEAD
-          instance.extend Rails32PathResolver if asset_pipeline_enabled?
-          instance
-        end
-
-        def rails_defined?
-          const_defined? :Rails
-=======
-        
-          if uses_rails32?
-            instance.extend Rails32PathResolver
-          elsif uses_rails? #fallback to rails without asset pipeline
-            instance.extend RailsPathResolver
-          end
-
-          instance
-        end
-
-        def uses_rails?
-          const_defined?(:Rails)
-        end
-
-        def uses_rails32?
-          uses_rails?  &&  ::Rails::VERSION::STRING =~ /^[3-9]\.[1-9]/
->>>>>>> c8c05bfdca05b2ee989fd7040676cebe6f2f2b88
-        end
-
-        def asset_pipeline_enabled?
-           rails_defined? && 
-           Rails.respond_to?(:application) &&
-           Rails.application.respond_to?(:config) &&
-           Rails.application.config.respond_to?(:assets) && 
-           Rails.application.config.assets.enabled
-        end  
-      end
-    end
-  end
-end