caboose-cms 0.7.15 → 0.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3bc91a68ac489055a20331a782782326c88372c
-  data.tar.gz: 77c3b560746c55e2041fc8fdc582f467f59df528
+  metadata.gz: 5296ff62df1d3dca4dc184aa275bb11324a4a5d5
+  data.tar.gz: 7170556acc8d764c0859353cf077576ec72d08fb
 SHA512:
-  metadata.gz: 313817ce1e2ef39a0a17e1fb8bbeed8e6d01e8b7b0bd9da1c5ef4f714a7be5f04b8690ccc7707e4460d9bdb05db2447580323fbe20e43b8b36681327863b1531
-  data.tar.gz: 5e837e9d369992d23e50abfe29060c18a6aee1c0c7d3b85471a69653857ae29d392efc86e2e977d5a915e5b1e06ce8fcbc25d6a8ca9581390008c425a0eb1c45
+  metadata.gz: 7597b374c85781663a6af491668112579c21cce9dbe32d550ffbd8ddcc27b8a57e9044a9f9a49c5323d05f9357591db65e5745a398f3abbf808abb98a8214ed1
+  data.tar.gz: 4ca180a513d793b898def98f75d5a7db0f6f486de6e7cf7d76738d75c801f75575c77d33df732d5614f095fa8b49dcee31b5286f240633c79b5f44e2d6ebff0f

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.15'
+  VERSION = '0.7.16'
 end

data/lib/tasks/caboose.rake

@@ -1,4 +1,5 @@
 require "caboose/version"
+require 'aws-sdk'
 
 namespace :caboose do
 
@@ -296,57 +297,79 @@ end
 namespace :assets do
 
   desc "Precompile assets, upload to S3, then remove locally"
-  task :purl => :environment do
-  
-    # Copy any site assets into the host app assets directory first
-    puts "Copying site assets into host assets..."
-    Caboose::Site.all.each do |site|
-      site_js     = Rails.root.join('sites', site.name, 'js')    
-      site_css    = Rails.root.join('sites', site.name, 'css')   
-      site_images = Rails.root.join('sites', site.name, 'images')
-      site_fonts  = Rails.root.join('sites', site.name, 'fonts') 
-          
-      host_js     = Rails.root.join('app', 'assets', 'javascripts' , site.name)
-      host_css    = Rails.root.join('app', 'assets', 'stylesheets' , site.name)
-      host_images = Rails.root.join('app', 'assets', 'images'      , site.name)
-      host_fonts  = Rails.root.join('app', 'assets', 'fonts'       , site.name)
+  task :purl, [:filename] => :environment do |t, args|
+    
+    # PURL a single file
+    if args.filename
+      dest = "#{Rails.root}/tmp/#{args.filename}"
       
-      `mkdir -p #{host_js     }` if File.directory?(site_js) 
-      `mkdir -p #{host_css    }` if File.directory?(site_css) 
-      `mkdir -p #{host_images }` if File.directory?(site_images) 
-      `mkdir -p #{host_fonts  }` if File.directory?(site_fonts)
-                             
-      `cp -R #{site_js     } #{host_js     }` if File.directory?(site_js) 
-      `cp -R #{site_css    } #{host_css    }` if File.directory?(site_css) 
-      `cp -R #{site_images } #{host_images }` if File.directory?(site_images) 
-      `cp -R #{site_fonts  } #{host_fonts  }` if File.directory?(site_fonts) 
-    end
+      # Compile the file
+      puts "Compiling #{args.filename}..."
+      File.write(dest, Uglifier.compile(Rails.application.assets.find_asset(args.filename).to_s))
+      
+      # Copy the file from dest to s3/assets
+      puts "Copying #{args.filename} to s3..."
+      config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))['production']    
+      AWS.config({ :access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'] })                     
+      bucket = AWS::S3::Bucket.new(config['bucket'])
+      obj = bucket.objects["assets/#{args.filename}"]
+      obj.write(:file => dest, :acl => :public_read)
+      
+      # Remove the temp file
+      puts "Cleaning up..."
+      `rm -rf #{dest}`      
     
-    puts "Running precompile..."
-    Rake::Task['assets:precompile'].invoke
-
-    puts "Removing assets from public/assets, but leaving manifest file..."    
-    `mv #{Rails.root.join('public', 'assets', 'manifest.yml')} #{Rails.root.join('public', 'manifest.yml')}`
-    `rm -rf #{Rails.root.join('public', 'assets')}`
-    `mkdir #{Rails.root.join('public', 'assets')}`     
-    `mv #{Rails.root.join('public', 'manifest.yml')} #{Rails.root.join('public', 'assets', 'manifest.yml')}`
+    else # Otherwise do a full PURL
     
-    # Clean up
-    puts "Removing site assets from host assets..."
-    Caboose::Site.all.each do |site|      
-      host_js     = Rails.root.join('app', 'assets', 'javascripts' , site.name)
-      host_css    = Rails.root.join('app', 'assets', 'stylesheets' , site.name)
-      host_images = Rails.root.join('app', 'assets', 'images'      , site.name)
-      host_fonts  = Rails.root.join('app', 'assets', 'fonts'       , site.name)
-                             
-      `rm -rf #{host_js     }`
-      `rm -rf #{host_css    }`
-      `rm -rf #{host_images }` 
-      `rm -rf #{host_fonts  }`
+      # Copy any site assets into the host app assets directory first
+      puts "Copying site assets into host assets..."
+      Caboose::Site.all.each do |site|
+        site_js     = Rails.root.join('sites', site.name, 'js')    
+        site_css    = Rails.root.join('sites', site.name, 'css')   
+        site_images = Rails.root.join('sites', site.name, 'images')
+        site_fonts  = Rails.root.join('sites', site.name, 'fonts') 
+            
+        host_js     = Rails.root.join('app', 'assets', 'javascripts' , site.name)
+        host_css    = Rails.root.join('app', 'assets', 'stylesheets' , site.name)
+        host_images = Rails.root.join('app', 'assets', 'images'      , site.name)
+        host_fonts  = Rails.root.join('app', 'assets', 'fonts'       , site.name)
+        
+        `mkdir -p #{host_js     }` if File.directory?(site_js) 
+        `mkdir -p #{host_css    }` if File.directory?(site_css) 
+        `mkdir -p #{host_images }` if File.directory?(site_images) 
+        `mkdir -p #{host_fonts  }` if File.directory?(site_fonts)
+                               
+        `cp -R #{site_js     } #{host_js     }` if File.directory?(site_js) 
+        `cp -R #{site_css    } #{host_css    }` if File.directory?(site_css) 
+        `cp -R #{site_images } #{host_images }` if File.directory?(site_images) 
+        `cp -R #{site_fonts  } #{host_fonts  }` if File.directory?(site_fonts) 
+      end
+              
+      puts "Running precompile..."
+      Rake::Task['assets:precompile'].invoke
+      
+      puts "Removing assets from public/assets, but leaving manifest file..."    
+      `mv #{Rails.root.join('public', 'assets', 'manifest.yml')} #{Rails.root.join('public', 'manifest.yml')}`
+      `rm -rf #{Rails.root.join('public', 'assets')}`
+      `mkdir #{Rails.root.join('public', 'assets')}`     
+      `mv #{Rails.root.join('public', 'manifest.yml')} #{Rails.root.join('public', 'assets', 'manifest.yml')}`
+                  
+      # Clean up
+      puts "Removing site assets from host assets..."
+      Caboose::Site.all.each do |site|      
+        host_js     = Rails.root.join('app', 'assets', 'javascripts' , site.name)
+        host_css    = Rails.root.join('app', 'assets', 'stylesheets' , site.name)
+        host_images = Rails.root.join('app', 'assets', 'images'      , site.name)
+        host_fonts  = Rails.root.join('app', 'assets', 'fonts'       , site.name)
+                               
+        `rm -rf #{host_js     }`
+        `rm -rf #{host_css    }`
+        `rm -rf #{host_images }` 
+        `rm -rf #{host_fonts  }`
+      end
     end
-
   end
-  
+
   desc "Fix variant sort order"
   task :set_variant_sort_order => :environment do
     Caboose::Product.all.each do |p|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
 platform: ruby
 authors:
 - William Barry