trackman 0.5.5 → 0.5.6

data/lib/trackman.rb

@@ -1,20 +1,16 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require File.expand_path('../trackman/utility/core_extensions', __FILE__)
-require File.expand_path('../trackman/utility/railtie', __FILE__)
+require File.expand_path("../trackman/utility/core_extensions", __FILE__)
 
 module Trackman
-  #TODO do something better than this to share the scope
-  def self.autoloads path, items
-    items.each do |s|
-      if block_given? 
-        yield(s, "#{path}/#{s.trackman_underscore}" ) 
-      else
-        autoload s, "#{path}/#{s.trackman_underscore}" 
-      end
-    end
-  end
+  autoload :Assets, 'trackman/assets'
+  autoload :Scaffold, 'trackman/scaffold'
+  autoload :Components, 'trackman/components'
+  autoload :Errors, 'trackman/errors'
+  autoload :Path, 'trackman/path'
+  autoload :Utility, 'trackman/utility'
+end
 
-  autoloads 'trackman', [:Assets, :Configuration, :Scaffold, :Components, :Errors, :Path, :Utility]
-end
+require File.expand_path("../trackman/utility/debugger", __FILE__)
+require File.expand_path("../trackman/utility/railtie", __FILE__)

data/lib/trackman/assets.rb

@@ -1,10 +1,14 @@
 module Trackman
   module Assets
-    @@classes = [:Asset, :HtmlAsset, :RemoteAsset, :CssAsset]
-    @@modules = [:CompositeAsset, :AssetFactory,  :BundledAsset, :RemoteAssetFactory, :Persistence]
-    
-    Trackman.autoloads 'trackman/assets', (@@classes + @@modules) do |s, p|
-      autoload s, p
-    end
+    autoload :Asset, 'trackman/assets/asset'
+    autoload :HtmlAsset, 'trackman/assets/html_asset'
+    autoload :RemoteAsset, 'trackman/assets/remote_asset'
+    autoload :CssAsset, 'trackman/assets/css_asset'
+
+    autoload :CompositeAsset, 'trackman/assets/composite_asset'
+    autoload :AssetFactory, 'trackman/assets/asset_factory'
+    autoload :BundledAsset, 'trackman/assets/bundled_asset'
+    autoload :RemoteAssetFactory, 'trackman/assets/remote_asset_factory'
+    autoload :Persistence, 'trackman/assets/persistence'
   end
 end

data/lib/trackman/assets/asset.rb

@@ -1,8 +1,8 @@
 module Trackman
   module Assets
     class Asset
-      extend AssetFactory, Components::Conventions
-      extend Components::Diffable, Components::Shippable
+      extend AssetFactory, Trackman::Components::Conventions
+      extend Trackman::Components::Diffable, Trackman::Components::Shippable
       include Comparable
       
       def initialize attributes = {}
@@ -65,10 +65,7 @@ module Trackman
         local = Asset.all
         remote = RemoteAsset.all
 
-        diff_result = diff(local, remote) 
-
-        Trackman::Utility::Debugger.trace diff_result.inspect
-
+        diff_result = diff(local, remote)
         ship diff_result
         
         true

data/lib/trackman/assets/asset_factory.rb

@@ -20,12 +20,12 @@ module Trackman
 
       def add_content_behavior instance
         if asset_pipeline_enabled?
-          instance.extend Path::Rails32Resolver, BundledAsset
+          instance.extend Trackman::Path::Rails32Resolver, BundledAsset
           return instance
         elsif rails_defined? #fallback to rails without asset pipeline
-          instance.extend Path::RailsResolver
+          instance.extend Trackman::Path::RailsResolver
         end
-        instance.extend Components::Hashable
+        instance.extend Trackman::Components::Hashable
 
         instance
       end

data/lib/trackman/assets/bundled_asset.rb

@@ -1,7 +1,7 @@
 module Trackman
   module Assets
     module BundledAsset
-      include Components::Hashable
+      include Trackman::Components::Hashable
       
       def env
         @@env ||= ::Rails.application.assets.index

data/lib/trackman/assets/persistence.rb

@@ -1,9 +1,7 @@
 module Trackman
   module Assets
     module Persistence
-      Trackman.autoloads 'trackman/assets/persistence', [:Remote] do |s, p|
-        autoload s, p
-      end
+      autoload :Remote, 'trackman/assets/persistence/remote'
     end
   end
 end

data/lib/trackman/components.rb

@@ -1,9 +1,8 @@
 module Trackman
   module Components
-    @@modules = [:Conventions, :Diffable, :Hashable, :Shippable]
-   
-    Trackman.autoloads 'trackman/components', @@modules do |s,p|
-        autoload s, p 
-    end
+    autoload :Conventions, 'trackman/components/conventions'
+    autoload :Diffable, 'trackman/components/diffable'
+    autoload :Hashable, 'trackman/components/hashable'
+    autoload :Shippable, 'trackman/components/shippable'
   end
 end

data/lib/trackman/errors.rb

@@ -1,9 +1,7 @@
 module Trackman
   module Errors
-    @@classes = [:AssetNotFoundError, :ConfigNotFoundError, :ConfigSetupError]
-    
-    Trackman.autoloads 'trackman/errors', @@classes do |s,p|
-        autoload s, p 
-    end
+    autoload :AssetNotFoundError, 'trackman/errors/asset_not_found_error'
+    autoload :ConfigNotFoundError, 'trackman/errors/config_not_found_error'
+    autoload :ConfigSetupError, 'trackman/errors/config_setup_error'
   end
 end

data/lib/trackman/path.rb

@@ -1,9 +1,7 @@
 module Trackman
   module Path
-    @@modules = [:Resolver, :Rails32Resolver, :RailsResolver]
-   
-    Trackman.autoloads 'trackman/path', @@modules do |s,p|
-        autoload s, p 
-    end
+    autoload :Resolver, 'trackman/path/resolver'
+    autoload :Rails32Resolver, 'trackman/path/rails32_resolver'
+    autoload :RailsResolver, 'trackman/path/rails_resolver'
   end
 end

data/lib/trackman/scaffold.rb

@@ -1,7 +1,5 @@
 module Trackman
   module Scaffold
-    Trackman.autoloads 'trackman/scaffold', [:ContentSaver] do |s,p|
-      autoload s, p
-    end
+    autoload :ContentSaver, 'trackman/scaffold/content_saver'
   end
 end

data/lib/trackman/utility.rb

@@ -1,9 +1,5 @@
 module Trackman
   module Utility
-    @@modules = [:Configuration, :Debugger]
-   
-    ::Trackman.autoloads 'trackman/utility', @@modules do |s,p|
-        autoload s, p 
-    end
+    autoload :Configuration, 'trackman/utility/configuration'
   end
 end

data/lib/trackman/utility/configuration.rb

@@ -27,7 +27,7 @@ module Trackman
         result = run "heroku config -s" do |option|
           "heroku config -s #{option}"
         end
-        Trackman::Configuration.s_to_h(result)
+        self.class.s_to_h(result)
       end
       
 

data/lib/trackman/utility/debugger.rb

@@ -7,7 +7,7 @@ module Trackman
       @@server_url = ENV['TRACKMAN_URL']
 
       def self.debug_mode?
-        !ENV['TRACKMAN_DEBUG_MODE'].nil? && ENV['TRACKMAN_DEBUG_MODE'] == 'true'
+        @@debug ||= ENV['TRACKMAN_DEBUG_MODE'] == 'true'
       end
 
       def self.trace data
@@ -20,5 +20,23 @@ module Trackman
     end
   end
 end
+if Trackman::Utility::Debugger.debug_mode?
+  RestClient.log = Logger.new(STDOUT) 
 
-RestClient.log = Logger.new(STDOUT) if Trackman::Utility::Debugger.debug_mode?
+  #loads module first
+  Trackman::Components::Diffable
+
+  module Trackman
+    module Components
+      module Diffable
+        alias old_diff diff
+        
+        def diff local, remote 
+          result = old_diff local, remote
+          Trackman::Utility::Debugger.trace "Diff result:\n#{result.inspect}"
+          result
+        end
+      end
+    end
+  end
+end

data/lib/trackman/utility/railtie.rb

@@ -19,8 +19,8 @@ if defined?(Rails)
     module Trackman
       class Railtie < Rails::Railtie
         rake_tasks do
-          path = '../rails_generators/trackman_tasks/templates/*.rake'
-          Dir[File.join(File.dirname(__FILE__), path)].each { |f| load f }
+          path = File.expand_path('../../../../rails_generators/trackman_tasks/templates/trackman.rake', __FILE__)
+          load path
         end
 
         initializer "trackman.hook" do |app|

data/lib/trackman/version.rb

@@ -1,3 +1,3 @@
 module Trackman
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/rails_generators/trackman_tasks/templates/trackman.rake

@@ -4,14 +4,12 @@ require 'trackman'
 namespace :trackman do
   desc "Syncs your assets with the server, this is what gets executed when you deploy to heroku."
   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, :app do |t, args|
     heroku_version = Gem.loaded_specs["heroku"].version.to_s
-    Trackman::Configuration.new(heroku_version, :app => args[:app]).setup
+    Trackman::Utility::Configuration.new(heroku_version, :app => args[:app]).setup
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackman
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client