compressit 1.0.4 → 1.1.0

data/lib/compressit/base.rb

@@ -3,31 +3,41 @@ module Compressit
     class << self
 
       def compressit(options)
-        @folder, @version, @ext = options[:folder], options[:version], options[:ext]
-        
-        @java, @yuicompressor = '/usr/bin/java', File.expand_path(File.dirname(__FILE__) + './../yuicompressor-2.4.6.jar')
-        
-        Dir.exists?("#{@folder}/compressed") ? true : Dir.mkdir("#{@folder}/compressed")
-        @destination_path = Dir.open("#{@folder}/compressed")
-        
-        @files_to_compress, @compressed   = Dir.glob("#{@folder}/**/*#{@ext}"), "compressed-#{@version}#{@ext}"
-        
+        java, yuicompressor = '/usr/bin/java', File.expand_path(File.dirname(__FILE__) + './../yuicompressor-2.4.6.jar')
+
+        case File.ftype(options[:data])
+        when 'file'
+          destination_path = Dir.open(File.dirname(options[:data]))
+          files_to_compress, compressed = Array[options[:data]], "#{File.basename(options[:data], ".#{options[:ext]}")}.min.#{options[:ext]}"
+        when 'directory'
+          Dir.exists?("#{options[:data]}/compressed") ? true : Dir.mkdir("#{options[:data]}/compressed")
+          destination_path = Dir.open("#{options[:data]}/compressed")
+          files_to_compress, compressed = Dir.glob("#{options[:data]}/**/*#{options[:ext]}"), "#{options[:version]}.min.#{options[:ext]}"
+        else
+          puts "Oops!"
+          exit
+        end
+
         # remove compressed file if the version hasn't been updated to avoid duplicate compression
-        `rm -f #{File.path(@destination_path)}/#{@compressed}` if File.exists?("#{File.path(@destination_path)}/#{@compressed}")
+        `rm -f #{File.path(destination_path)}/#{compressed}` if File.exists?("#{File.path(destination_path)}/#{compressed}")
+
+        puts "Compressing #{options[:ext]} file(s) into '#{File.path(destination_path)}/#{compressed}'"
         
-        # compress each file in @files_to_compress and save the compressed file to @destination_path
+        # compress each file in files_to_compress and save the compressed file to destination_path
         begin
-          @files_to_compress.each do |file|
+          puts "----- FILES: #{files_to_compress}"
+          files_to_compress.each do |file|
+            puts "----- FILE: #{file}"
             unless File.path(file).include?('compressed')
-              `#{@java} -jar #{@yuicompressor} #{file} >> #{File.path(@destination_path)}/#{@compressed}`
+              `#{java} -jar #{yuicompressor} #{file} >> #{File.path(destination_path)}/#{compressed}`
               puts "Added: #{File.basename(file)}... \n"
             end
           end
           
           # confirm compression and show destination path where file can be found
-          puts "Complete! Compressed #{@ext} file '#{@compressed}', can be found in '#{File.path(@destination_path)}'"
+          puts "Complete! Compressed #{options[:ext]} file '#{compressed}', can be found in '#{File.dirname(destination_path)}'"
         rescue
-          puts "Hmm... looks like this folder doesn't contain any #{@ext} files."
+          puts "Hmm... looks like this folder doesn't contain any #{options[:ext]} files."
         end
       end
       

data/lib/compressit/version.rb

@@ -1,3 +1,3 @@
 module Compressit
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/lib/compressit.rb

@@ -7,40 +7,46 @@ module Compressit
   
     def run(arguments)
       unless arguments.empty? || !arguments[0].include?('-')
-        options = Hash.new
-        
         optparser = OptionParser.new do|opts|
-          
-          opts.banner = "Usage: compressit [option] [FOLDER] [VERSION]"
+          opts.banner = "Usage: compressit -command [FILE/DIR]"
 
           opts.on('-h', '--help', 'Display this help') do
             puts optparser
+            exit
           end
           opts.on('-v', '--version', 'Display current gem version') do
-            puts "Currently using version: #{VERSION}"
+            puts "Compressit-#{VERSION}"
           end
-          opts.on('-c', '--css FOLDER VERSION', 'Compress css files from [FOLDER] into [FOLDER]/compressed') do
-            puts "Compressing css files from '#{arguments[0]}' into '#{arguments[0]}/compressed/compressed-#{arguments[1]}.css'"
-            options[:folder], options[:version], options[:ext] = arguments[0], arguments[1], '.css'
-            Compressit::Base.compressit(options)
+          opts.on('-f', '--file FILE', 'Compress file in place') do |file|
+            prepare(file)
           end
-          opts.on('-j', '--js FOLDER VERSION', 'Compress javascript files from [FOLDER] into [FOLDER]/compressed') do
-            puts "Compressing javascript files from '#{arguments[0]}' into '#{arguments[0]}/compressed/compressed-#{arguments[1]}.js'"
-            options[:folder], options[:version], options[:ext] = arguments[0], arguments[1], '.js'
-            Compressit::Base.compressit(options)
+          opts.on('-F', '--files DIR', 'Compress files from [DIR] into [DIR]/compressed') do |dir|
+            prepare(dir)
           end
         end
         
         begin optparser.parse!(arguments)
-        rescue OptionParser::InvalidOption => error
-          puts "#{error}, try one of this: "
+        rescue OptionParser::ParseError => error
+          puts "#{error}"
           puts optparser
-          exit 1
+          exit
         end
       else
         puts `compressit -h`
       end
     end
-  
+
+    def prepare(data)
+      options = Hash[:data, data]
+
+      puts "Specify a version (ex. x.x.x):"
+      options[:version] = gets.strip
+
+      puts "css/js:"
+      options[:ext] = gets.strip
+
+      Compressit::Base.compressit(options)
+    end
+ 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compressit
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70181998155980 !ruby/object:Gem::Requirement
+  requirement: &70221588443380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181998155980
+  version_requirements: *70221588443380
 description: Compressit uses the yuicompressor-2.4.6.jar java file created by Yahoo
   to compress all of your .css and .js files into single compressed files respectively.
   This not only reduces the size of your files, but also results in less http requests