asset_sync 0.1.6 → 0.1.7

data/README.md

@@ -16,7 +16,7 @@ We are currently trying to talk with Heroku to iron these out.
 
 ### 1. RAILS_ENV
 
-When you see `rake assets:precompile` during deployment. Herok is actually running something like
+When you see `rake assets:precompile` during deployment. Heroku is actually running something like
 
     env RAILS_ENV=production DATABASE_URL=scheme://user:pass@127.0.0.1/dbname bundle exec rake assets:precompile 2>&1
 

data/lib/asset_sync.rb

@@ -3,4 +3,8 @@ require 'active_model'
 require 'erb'
 require "asset_sync/asset_sync"
 require 'asset_sync/config'
-require 'asset_sync/storage'
+require 'asset_sync/storage'
+
+
+require 'asset_sync/railtie'
+require 'asset_sync/engine'

data/lib/asset_sync/asset_sync.rb

@@ -8,7 +8,6 @@ module AssetSync
 
     def config
       @config ||= Config.new
-      raise Config::Invalid.new(@config.errors.full_messages.join(', ')) unless @config && @config.valid?
       @config
     end
 
@@ -22,9 +21,10 @@ module AssetSync
     end
 
     def sync
+      raise Config::Invalid.new(config.errors.full_messages.join(', ')) unless config && config.valid?
       self.storage.sync
     end
 
   end
 
-end
+end

data/lib/asset_sync/config.rb

@@ -40,11 +40,11 @@ module AssetSync
     end
 
     def load_yml!
-      self.aws_access_key         = yml["aws_access_key"]
-      self.aws_access_secret      = yml["aws_access_secret"]
-      self.aws_bucket             = yml["aws_bucket"]
-      self.aws_region             = yml["aws_region"]
-      self.existing_remote_files  = yml["existing_remote_files"]
+      self.aws_access_key         = yml["aws_access_key"] if yml.has_key?("aws_access_key")
+      self.aws_access_secret      = yml["aws_access_secret"] if yml.has_key?("aws_access_secret")
+      self.aws_bucket             = yml["aws_bucket"] if yml.has_key?("aws_bucket")
+      self.aws_region             = yml["aws_region"] if yml.has_key?("aws_region")
+      self.existing_remote_files  = yml["existing_remote_files"] if yml.has_key?("existing_remote_files")
 
       # TODO deprecate old style config settings
       self.aws_access_key         = yml["access_key_id"] if yml.has_key?("access_key_id")

data/lib/asset_sync/engine.rb

@@ -0,0 +1,27 @@
+class Engine < Rails::Engine
+
+  engine_name "asset_sync"
+
+  initializer "asset_sync config", :group => :all do |app|
+    app_initializer = File.join(Rails.root, 'config/initializers/asset_sync.rb')
+    app_yaml = File.join(Rails.root, 'config/asset_sync.yml')
+
+    if File.exists?( app_initializer )
+      STDERR.puts "AssetSync: using #{app_initializer}"
+      load app_initializer
+    else
+      STDERR.puts "AssetSync: using default configuration from built-in initializer"
+      AssetSync.configure do |config|
+        config.aws_access_key = ENV['AWS_ACCESS_KEY']
+        config.aws_access_secret = ENV['AWS_ACCESS_SECRET']
+        config.aws_bucket = ENV['AWS_BUCKET']
+        config.existing_remote_files = "keep"
+      end
+    end
+
+    if File.exists?( app_yaml )
+      STDERR.puts "AssetSync: YAML file found #{app_yaml} settings will be merged into the configuration"
+    end
+  end
+
+end

data/lib/asset_sync/railtie.rb

@@ -0,0 +1,25 @@
+class Rails::Railtie::Configuration
+  # Adds compass configuration accessor to the application configuration.
+  #
+  # If a configuration file for compass exists, it will be read in and
+  # the project's configuration values will already be set on the config
+  # object.
+  #
+  # For example:
+  #
+  #     module MyApp
+  #       class Application < Rails::Application
+  #          config.compass.line_comments = !Rails.env.production?
+  #          config.compass.fonts_dir = "app/assets/fonts"
+  #       end
+  #     end
+  #
+  # It is suggested that you create a compass configuration file if you
+  # want a quicker boot time when using the compass command line tool.
+  #
+  # For more information on available configuration options see:
+  # http://compass-style.org/help/tutorials/configuration-reference/
+  def asset_sync
+    AssetSync.config
+  end
+end

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/generators/asset_sync/install_generator.rb

@@ -34,8 +34,8 @@ module AssetSync
       end
     end
 
-    def generate_rake_task
-      template "asset_sync.rake", "lib/tasks/asset_sync.rake"
-    end
+    # def generate_rake_task
+    #   template "asset_sync.rake", "lib/tasks/asset_sync.rake"
+    # end
   end
 end

data/lib/generators/asset_sync/templates/asset_sync.yml

@@ -3,19 +3,25 @@ defaults: &defaults
   secret_access_key: "<%= aws_access_secret %>"
   # You may need to specify what region your S3 bucket is in
   # region: "eu-west-1"
+  existing_remote_files: keep
 
 development:
   <<: *defaults
   bucket: "<%= app_name %>_development"
-  existing_remote_files: keep # Existing pre-compiled assets on S3 will be kept
+  # Existing pre-compiled assets on S3 will be kept
+  # existing_remote_files: keep
 
 test:
   <<: *defaults
   bucket: "<%= app_name %>_test"
-  existing_remote_files: keep
+
+staging:
+  <<: *defaults
+  bucket: "<%= app_name %>_test"
 
 production:
   <<: *defaults
   bucket: "<%= app_name %>_production"
-  existing_remote_files: delete # Existing pre-compiled assets on S3 will be deleted
+  # Existing pre-compiled assets on S3 will be deleted
+  # existing_remote_files: delete 
 

data/lib/tasks/asset_sync.rake

@@ -0,0 +1,7 @@
+Rake::Task["assets:precompile"].enhance do
+  # rails 3.1.1 will clear out Rails.application.config if the env vars
+  # RAILS_GROUP and RAILS_ENV are not defined. We need to reload the
+  # assets environment in this case.
+  Rake::Task["assets:environment"].invoke if Rake::Task.task_defined?("assets:environment")
+  AssetSync.sync
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-08-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70173874548220 !ruby/object:Gem::Requirement
+  requirement: &70350244355240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173874548220
+  version_requirements: *70350244355240
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70173874547760 !ruby/object:Gem::Requirement
+  requirement: &70350244354660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173874547760
+  version_requirements: *70350244354660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70173874547260 !ruby/object:Gem::Requirement
+  requirement: &70350244353580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173874547260
+  version_requirements: *70350244353580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70173874540440 !ruby/object:Gem::Requirement
+  requirement: &70350244353160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173874540440
+  version_requirements: *70350244353160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70173874540020 !ruby/object:Gem::Requirement
+  requirement: &70350244352660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173874540020
+  version_requirements: *70350244352660
 description: After you run assets:precompile your assets will be synchronised with
   your S3 bucket, deleting unused files and only uploading the files it needs to.
 email:
@@ -84,12 +84,15 @@ files:
 - lib/asset_sync.rb
 - lib/asset_sync/asset_sync.rb
 - lib/asset_sync/config.rb
+- lib/asset_sync/engine.rb
+- lib/asset_sync/railtie.rb
 - lib/asset_sync/storage.rb
 - lib/asset_sync/version.rb
 - lib/generators/asset_sync/install_generator.rb
 - lib/generators/asset_sync/templates/asset_sync.rake
 - lib/generators/asset_sync/templates/asset_sync.rb
 - lib/generators/asset_sync/templates/asset_sync.yml
+- lib/tasks/asset_sync.rake
 - spec/asset_sync_spec.rb
 - spec/spec_helper.rb
 - spec/with_yml/config/asset_sync.yml