trackman 0.6.11 → 0.6.12

data/.gitignore

@@ -4,4 +4,5 @@ Gemfile.lock
 pkg/*
 *.orig
 *.DS_Store
-.rspec
+.rspec
+*.swp

data/Gemfile

@@ -1,5 +1,3 @@
 source "http://rubygems.org"
 
-gemspec
-
-gem 'rest-client', :git => 'git@github.com:jfabre/rest-client.git'
+gemspec

data/Rakefile

@@ -1,4 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
 
 desc "creates a new app to the server and outputs the credentials"
 task :create_app do
@@ -49,3 +51,35 @@ namespace :setup do
     end
   end
 end
+
+namespace :ci do 
+  namespace :setup do
+    task :server do 
+      to_unset = ENV.select{|k,v| k.include? 'BUNDLE' }
+      to_unset.each_key { |k| to_unset[k] = nil }
+
+      pid = spawn(to_unset, "update_trackman_server")
+      Process.wait(pid)
+
+      spawn(to_unset, "start_trackman_server")
+      
+      sleep(10)
+    end
+  end
+  namespace :kill do
+    task :server do
+      result = `lsof -i :3000`
+      pid = result.match(/ruby\ +(\d+)/)[1].to_i
+
+      puts "Killing #{pid}"
+      Process.kill 9, pid
+    end
+  end
+end
+
+RSpec::Core::RakeTask.new do |task|
+  task.pattern = Dir['spec'].sort
+  task.rspec_opts = Dir.glob("[0-9][0-9][0-9]_*").collect { |x| "-I#{x}" }
+  task.rspec_opts << '--color -f d'
+end
+

data/lib/trackman/tasks/trackman.rake

@@ -1,7 +1,7 @@
 require 'rest-client'
 require 'trackman'
 
-#only load this rakefil for sinatra/rack apps 
+#only load this rakefile for sinatra/rack apps 
 namespace :trackman do
   desc "Syncs your assets with the server, this is what gets executed when you deploy to heroku."
   task :sync do 
@@ -10,7 +10,6 @@ namespace :trackman do
 
   desc "Sets up the heroku configs required by Trackman"
   task :setup, :app do |t, args|
-    heroku_version = Gem.loaded_specs["heroku"].version.to_s
-    Trackman::Utility::Configuration.new(heroku_version, :app => args[:app]).setup
+    Trackman::Utility::Configuration.new(:app => args[:app]).setup
   end
-end
+end

data/lib/trackman/utility/configuration.rb

@@ -2,17 +2,17 @@ require 'versionomy'
 
 module Trackman
   module Utility
-  	class Configuration
-  		@@ERROR = 'ERROR_PAGE_URL'
-  	  @@MAINTENANCE = 'MAINTENANCE_PAGE_URL'
+    class Configuration
+      @@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, :options
 
-  	  def initialize(heroku_version, options = {})
+  	  def initialize(options = {})
   	  	self.options = options
-        self.heroku_version = heroku_version
+        self.heroku_version = get_version
         self.configs = get_configs
   	  end
 
@@ -23,11 +23,23 @@ module Trackman
         puts "Done!"
   	  end
 
+      def get_version
+        Bundler.with_clean_env do
+          which_result = `which heroku`
+          raise 'Could not find heroku toolbelt or gem. Make sure you installed one of them.' unless which_result && which_result.length > 0
+        
+          heroku_version = `heroku --version`
+          heroku_version.match(/heroku-.*(\d+\.?\d+\.?\d+).*\(/)[1] 
+        end
+      end
+      
       def get_configs
-        result = run "heroku config -s" do |option|
-          "heroku config -s #{option}"
+        Bundler.with_clean_env do
+          result = run "heroku config -s" do |option|
+            "heroku config -s #{option}"
+          end
+          self.class.s_to_h(result)
         end
-        self.class.s_to_h(result)
       end
       
 
@@ -77,12 +89,14 @@ module Trackman
 
   		private
   		  def is_heroku_valid
-  		  	Versionomy.parse(heroku_version) >= Versionomy.parse("2.26.2")
+          Versionomy.parse(heroku_version) >= Versionomy.parse("2.26.2")
   		  end
 
   		  def add_config add
-          run "heroku config:add #{add}" do |option|
-            "heroku config:add #{option} #{add}"
+          Bundler.with_clean_env do
+            run "heroku config:add #{add}" do |option|
+              "heroku config:add #{option} #{add}"
+            end
           end
   		  end
 

data/lib/trackman/version.rb

@@ -1,3 +1,3 @@
 module Trackman
-  VERSION = "0.6.11"
+  VERSION = "0.6.12"
 end

data/rails_generators/trackman_tasks/templates/trackman.rake

@@ -9,7 +9,6 @@ namespace :trackman do
 
   desc "Sets up the heroku configs required by Trackman"
   task :setup, :app do |t, args|
-    heroku_version = Gem.loaded_specs["heroku"].version.to_s
-    Trackman::Utility::Configuration.new(heroku_version, :app => args[:app]).setup
+    Trackman::Utility::Configuration.new(:app => args[:app]).setup
   end
-end
+end

data/trackman.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "nokogiri"
   s.add_runtime_dependency "rack"
-  s.add_runtime_dependency "heroku", ">= 2.26.2"
   s.add_runtime_dependency "versionomy"
-  
+
   s.add_development_dependency "rspec"
   s.add_development_dependency "sprockets"
+  s.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackman
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -77,13 +77,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: heroku
+  name: versionomy
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.26.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,16 +91,16 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.26.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: versionomy
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -125,7 +125,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -511,12 +511,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1816326835647719649
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1816326835647719649
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24