compressor 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56886396eac0a46fc4a7548f55fdc76800308b33
-  data.tar.gz: bddd23186feed0228e3c334e0c210de10e0c1b26
+  metadata.gz: 3b9e88b6987f1b08a32f163c2d5b434e7049b07a
+  data.tar.gz: 249211f3d66c4196f2a2f391f35bcb03b2a5d51a
 SHA512:
-  metadata.gz: 4c3a278dc176b6ae6aa3442ae2ddd1db2ae15ee8c9fceaa8109f60b89672103c12b74b7973c85a31f4531d336c30852044ce487707c678209895da7780a37a73
-  data.tar.gz: 22ec027621afe42c3e3b5da334d092cacb50b37b8f62eeceafeb9c444b27b9968ceecbcefa62d722789c58f9679699af0bc5ec8157889803df6bab2a37de6224
+  metadata.gz: d61305bad63b1aad29a7548fce3791aac215042efa39df8d830da3b1fe6fdc0dbf081d92f3e6239d35c2d4346a52beb8f692597d48251b8e4965e9774c6010f9
+  data.tar.gz: a05c68c1efc3e2a66689b6fbed37d549015dcbf7adfaea264d1066a74ae28e153690add25921b2e823d135f6bb63e9fa894547aac9ad43bf6df013f3bcfc570a

data/lib/compressor.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'fileutils'
 
 unless defined?(Motion::Project::Config)
   raise "This file must be required within a RubyMotion project Rakefile."
@@ -7,19 +8,18 @@ end
 module Motion::Project
   class Config
     def concat_files(opts={})
-       files_to_concatenate = extract_concatenated_files(Array(opts[:exclude]))
-       concatenate_files!(files_to_concatenate, opts[:parallel] || 4)
+       concatenate_files!(extract_concatenated_files(Array(opts[:exclude])), opts[:parallel] || 4)
     end
 
     private
 
     def extract_concatenated_files(excluded=[])
       @files.flatten!
-      @concatenated_files = @files.select { |f| excluded.none? { |excluded_match| !!f.match(excluded_match) } }
+      concatenated_files = @files.select { |f| excluded.none? { |excluded_match| !!f.match(excluded_match) } }
       old_dependencies = @dependencies
+      @files = @files - concatenated_files
       @dependencies = Dependency.new(@files - @exclude_from_detect_dependencies, @dependencies).run
-      @files = @files - @concatenated_files
-      @concatenated_files = order_concatenated_files(@concatenated_files)
+      order_concatenated_files(concatenated_files)
     end
 
     def order_concatenated_files(concatenated_files)
@@ -28,14 +28,18 @@ module Motion::Project
 
     def concatenate_files!(concat_files, parallel=4)
       group_number = 1
-      concatenated = []
+      previous_concat_path = nil
+
       concat_files.in_groups(parallel, false) do |group|
         concat_path = File.join(File.expand_path(@project_dir), "build", "app-concatenated-#{group_number}.rb")
-        File.delete(concat_path) if File.exist?(concat_path)
-        Dir.mkdir(File.dirname(concat_path)) unless File.exist?(File.dirname(concat_path))
+        temp_concat_path = File.join(File.expand_path(@project_dir), "build", "app-concatenated-#{group_number}-temp.rb")
         Motion::Project::App.info "Concat", concat_path
 
-        File.open(concat_path, 'a') do |concat|
+        # Prep the concat path for writing
+        Dir.mkdir(File.dirname(concat_path)) unless File.exist?(File.dirname(concat_path))
+
+        # Concatenate this group of files
+        File.open(temp_concat_path, 'a') do |concat|
           concat << "# File generated by 'Compressor' by Jamon Holmgren\n\n"
           concat << "# "
           group.each do |filename|
@@ -46,11 +50,28 @@ module Motion::Project
             concat << "\n"
           end
         end
-        concatenated << concat_path
+
+        if File.exist?(concat_path) && !FileUtils.cmp(temp_concat_path, concat_path)
+          # Changed file, replace the original
+          File.delete(concat_path)
+          FileUtils.mv(temp_concat_path, concat_path)
+        else
+          # No change, throw it away
+          File.delete(temp_concat_path)
+        end
+
+        # Add this concatenated file to the build files
+        @files.unshift concat_path
+
+        # Ensure that each file gets loaded in the right order
+        if previous_concat_path
+          files_dependencies concat_path => previous_concat_path
+        end
+        previous_concat_path = concat_path
+
+        # Next group
         group_number += 1
       end
-      @files.unshift(concatenated)
-      @files.flatten!
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compressor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jamon Holmgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake