compressit 0.5.1 → 0.9.0

data/README.rdoc

@@ -4,21 +4,21 @@ Compressit provides a simple way to compress your project .css and .js files to
 
 == Features
 
-Compressit is designed to work within Rails projects or stand-alone, and supports the following:
-	
-* Rake tasks
-* Command Line Input (CLI) (coming soon)
-* Thor tasks (coming soon)
+* Command Line Input (CLI)	
+* Rake tasks (discontinued)
+* Thor tasks (discontinued)
 	
 == Install
 
-=== Rails
+=== Rails (discontinued support)
+
+NOTE: This will still work with Rails, however I have discontinued a specific rails 'integration' due to a very similar feature being added with the release of Rails 3.1
 
 Add this line to your Gemfile:
 
  gem 'compressit'
 
-Then bundle install:
+Then do a bundle install:
 	
  bundle install
 	
@@ -30,44 +30,21 @@ Then bundle install:
 	
 == Usage
 
-=== CLI
-
-(coming soon)
-
----
-
-=== Rake
-
-==== Rails
-Setup (It is not required that you run this as both the .css and .js rake tasks will run it automatically):
-
- rake compressit:setup
-
-* Creates 'config/initializers/compressit.rb' with the version constants 'CSS_VERSION' and 'JS_VERSION' defaulted to '1.0.0'
-* Creates 'public/stylesheets/compressed/' where compressed .css file is saved
-* Creates 'public/javascripts/compressed/' where the compressed file is saved
-
-Iterates through 'public/stylesheets' and compresses all .css files placing them into 'public/stylesheets/compressed/'
-	
- rake compressit:css
-	
-Iterates through 'public/javascripts' and compresses all .js files placing them into 'public/javascripts/compressed/'
-	
- rake compressit:js
-
-Versioning:
-
-Use 'config/initializers/compressit.rb' to version your .css and .js files. If you do not increment the version at all the previous file will just be overwritten
-
-==== Non-Rails
-
-(coming soon)
+  Usage: compressit [option] [FOLDER] [VERSION]
+  
+    -h, --help                      Display this screen
+    -v, --version                   Display current gem version
+    -c, --css FOLDER VERSION        Compress css files from [FOLDER] into [FOLDER]/compressed
+    -j, --js FOLDER VERSION         Compress javascript files from [FOLDER] into [FOLDER]/compressed
 
 ---
 
-=== Thor
+== TODO
 
-(coming soon)
+* May add a better versioning system
+* Initially had the ability to specify a destination folder, may add this back if requested
+* Tests
+* One final pass of cleanup and refactoring
 
 == Copyright
 

data/bin/compressit

@@ -7,4 +7,4 @@ rescue LoadError
   require 'compressit'
 end
 
-Compressit.run(ARGV, STDIN)
+Compressit.run(ARGV)

data/lib/compressit.rb

@@ -1,51 +1,42 @@
-require 'optparse'
-
-require 'compressit/base'
-require 'compressit/version'
+Dir["#{File.dirname(__FILE__)}/compressit/*"].each {|file| require(file)}
 
-require 'compressit/railtie' if defined?(Rails)
+require 'optparse'
 
 module Compressit
   class << self
   
-    def run(arguments, stdin)
-      @arguments  = arguments
-      @stdin      = stdin
-    
-      if parsed_options? && arguments_valid?
-        process_arguments
-        process_command
-      else
-        # Compressit::Base.show_usage
+    def run(arguments)
+      options = Hash.new
+      
+      optparser = OptionParser.new do|opts|
+        
+        opts.banner = "Usage: compressit [option] [FOLDER] [VERSION]"
+
+        opts.on('-h', '--help', 'Display this help') do
+          puts optparser
+        end
+        opts.on('-v', '--version', 'Display current gem version') do
+          puts "Currently using version: #{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)
+        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)
+        end
       end
-    end
-  
-    def parsed_options?
-      oparser = OptionParser.new
-      oparser.on('-h', '--help')                    {Compressit::Base.show_usage}
-      oparser.on('-s', '--setup')                   {Compressit::Base.setup}
-      oparser.on('-v', '--version')                 {puts "#{VERSION}"}
-    
-      oparser.on('-css', '--css')                   {Compressit::Base.css}
-      oparser.on('-js', '--js')                     {Compressit::Base.js}
       
-      oparser.parse!(@arguments) rescue return false
-    end
-  
-    # True if required arguments were provided
-    def arguments_valid?
-      # TO DO - implement your real logic here
-      true
+      begin optparser.parse!(arguments)
+      rescue OptionParser::InvalidOption => error
+        puts "Oops! #{error}, try this: "
+        puts optparser
+        exit 1
+      end
     end
   
-    # Setup the arguments
-    def process_arguments
-      # TO DO - place in local vars, etc
-    end
-
-    def process_command
-      # TO DO - do whatever this app does
-    end
-
   end
 end

data/lib/compressit/base.rb

@@ -2,101 +2,31 @@ module Compressit
   module Base
     class << self
 
-      def setup
-        @java = '/usr/bin/java'
-        @yuicompressor = File.expand_path(File.dirname(__FILE__) + './../yuicompressor-2.4.6.jar')
+      def compressit(options)
+        @version, @ext, @folder  = options[:version], options[:ext], options[:folder]
         
-        if defined?(Rails)
-          # install thor tasks (coming soon)
-          # `thor install lib/tasks/compressit.thor`
-          
-          # create the rails initializer that will contain the css/js version constants
-          unless File.exists?("#{Rails.root}/config/initializers/compressit.rb")
-            File.open("#{Rails.root}/config/initializers/compressit.rb", 'w') do |file|
-              file.puts "CSS_VERSION = '1.0.0'"
-              file.puts "JS_VERSION = '1.0.0'"
-            end
-          end
-          
-          # create the folder where the compressed .css files will be saved
-          File.directory?("#{Rails.root}/public/stylesheets/compressed") ? true : Dir.mkdir("#{Rails.root}/public/stylesheets/compressed")
-          
-          # create the folder where the compressed .js files will be saved
-          File.directory?("#{Rails.root}/public/javascripts/compressed") ? true : Dir.mkdir("#{Rails.root}/public/javascripts/compressed")
-          
-          # after the initializer has been created it needs to be required because it cannot be accessed through rake tasks
-          require "#{Rails.root}/config/initializers/compressit.rb"
-          
-          # set css/js instance variables from css/js constants
-          @css_version  = CSS_VERSION
-          @js_version   = JS_VERSION
-        else
-          # coming soon
-        end
-      end
-      
-      def css
-        if defined?(Rails)
-          @files_to_compress         = Dir.glob("#{Rails.root}/public/stylesheets/**/*.css")
-          @destination_path          = Dir.open("#{Rails.root}/public/stylesheets/compressed")
-        else
-          # coming soon
-        end
-        
-        @ext                         = '.css'
-        @compressed                  = "compressed-#{@css_version}#{@ext}"
+        @java, @yuicompressor = '/usr/bin/java', File.expand_path(File.dirname(__FILE__) + './../yuicompressor-2.4.6.jar')
         
-        compressit
-      end
-
-      def js
-        if defined?(Rails)
-          @files_to_compress         = Dir.glob("#{Rails.root}/public/javascripts/**/*.js")
-          @destination_path          = Dir.open("#{Rails.root}/public/javascripts/compressed")
-        else
-          # coming soon
-        end
+        Dir.exists?("#{@folder}/compressed") ? true : Dir.mkdir("#{@folder}/compressed")
+        @destination_path = Dir.open("#{@folder}/compressed")
         
-        @ext                         = '.js'
-        @compressed                  = "compressed-#{@js_version}.#{@ext}"
+        @files_to_compress, @compressed   = Dir.glob("#{@folder}/**/*#{@ext}"), "compressed-#{@version}#{@ext}"
         
-        compressit
-      end
-
-      def compressit
         # 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}")
-
+        
         # compress each file in @files_to_compress and save the compressed file to @destination_path
-        @files_to_compress.each do |file|
-          `#{@java} -jar #{@yuicompressor} #{file} >> #{File.path(@destination_path)}/#{@compressed}`
-          puts "Added: #{File.basename(file)}... \n"
+        begin
+          @files_to_compress.each do |file|
+            `#{@java} -jar #{@yuicompressor} #{file} >> #{File.path(@destination_path)}/#{@compressed}`
+            puts "Added: #{File.basename(file)}... \n"
+          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)}'"
+        rescue
+          puts "Hmm... looks like this folder doesn't contain any #{@ext} files."
         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)}'"
-      end
-      
-      # add the ability to see css/js version. do 
-      
-      def show_usage
-        puts %{
-          --- Usage ---
-          (--)help, -h                   # show this usage
-          (--)setup, -s                  # create initial .css and .js version files
-          (--)version, -v                # show the current gem version
-                                         
-          (--)css, -css                  # compress .css files with the version specified in the config file (coming soon)
-          (--)js, -js                    # compress .js files with the version specified in the config file (coming soon)
-                                         
-          --- Rake Tasks ---             
-          rake css                       # compress .css files with the version specified in the config file
-          rake js                        # compress .js files with the version specified in the config file
-                                         
-          --- Thor Tasks ---             
-          thor css                       # compress .css files with the version specified in the config file (coming soon)
-          thor js                        # compress .js files with the version specified in the config file (coming soon)
-        }
       end
       
     end

data/lib/compressit/version.rb

@@ -1,3 +1,3 @@
 module Compressit
-  VERSION = "0.5.1"
+  VERSION = "0.9.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: compressit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.9.0
 platform: ruby
 authors: 
 - sdomino
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 Z
+date: 2011-08-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -42,10 +42,7 @@ files:
 - compressit.gemspec
 - lib/compressit.rb
 - lib/compressit/base.rb
-- lib/compressit/railtie.rb
 - lib/compressit/version.rb
-- lib/tasks/compressit.rake
-- lib/tasks/compressit.thor
 - lib/yuicompressor-2.4.6.jar
 - spec/compressit_spec.rb
 - spec/spec_helper.rb

data/lib/compressit/railtie.rb

@@ -1,16 +0,0 @@
-require 'rails'
-
-module Compressit
-  class Railtie < Rails::Railtie
-    
-    # initializer "compressit.configure_rails_initialization" do
-    #   
-    # end
-    
-    rake_tasks do
-      # load "tasks/compressit.tasks"
-      load "tasks/compressit.rake"
-    end
-    
-  end
-end

data/lib/tasks/compressit.rake

@@ -1,20 +0,0 @@
-require 'compressit'
-
-namespace :compressit do
-  
-  desc ''
-  task :setup do
-    Compressit::Base.setup
-  end
-  
-  desc ''
-  task :css => :setup do
-    Compressit::Base.css
-  end
-  
-  desc ''
-  task :js => :setup do
-    Compressit::Base.js
-  end
-  
-end

data/lib/tasks/compressit.thor

@@ -1,27 +0,0 @@
-# require 'compressit'
-
-class Compressit < Thor
-  
-  desc ''
-  def config do
-    Compressit::Base.config
-  end
-	
-	desc ''
-  def setup do
-    Compressit::Base.setup
-  end
-
-  desc ''
-  method_options :version, :default => "1.0.0"
-  def css do
-    Compressit::Base.css
-  end
-  
-  desc ''
-  method_options :version, :default => "1.0.0"
-  def js do
-    Compressit::Base.js
-  end
-
-end