csscss 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
-## 0.1.0 ##
+## 0.2.0 - 3/24/2013 ##
+
+* Colorizes text output.
+* Supports scss/sass files.
+* Fixes newline output bug when there are no redundancies
+* Downloads remote css files if passed a URL
+* Fixes bug with double semicolons (blank attributes)
+
+## 0.1.0 - 3/21/2013 ##
 
 * Initial project release.

data/Gemfile

@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in csscss.gemspec
 gemspec
 
+# optional runtime dependencies
+gem "sass"
+gem "compass"
+
 gem "rake", :require => false
 gem "debugger"
 

data/Gemfile.lock

@@ -1,20 +1,28 @@
 PATH
   remote: .
   specs:
-    csscss (0.1.0)
+    csscss (0.2.0)
+      colorize
       parslet (~> 1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     blankslate (2.1.2.4)
+    chunky_png (1.2.7)
+    colorize (0.5.8)
     columnize (0.3.6)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     debugger (1.5.0)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
       debugger-ruby_core_source (~> 1.2.0)
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.2.0)
+    fssm (0.2.10)
     m (1.3.1)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
@@ -25,11 +33,13 @@ GEM
       blankslate (~> 2.0)
     rake (10.0.3)
     ruby-prof (0.13.0)
+    sass (3.2.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  compass
   csscss!
   debugger
   m
@@ -37,3 +47,4 @@ DEPENDENCIES
   minitest-rg
   rake
   ruby-prof
+  sass

data/README.md

@@ -24,15 +24,30 @@ Then you can run it in at the command line against CSS files.
 
     $ csscss path/to/styles.css path/to/other-styles.css
 
+    {.contact .content .primary} and {article, #comments} share 5 rules
+    {.profile-picture}, {.screenshot img} and {a.blurb img} share 4 rules
+    {.work h2:first-child, .archive h2:first-child, .missing h2:first-child, .about h2, .contact h2} and {body.home h2} share 4 rules
+    {article.blurb:hover} and {article:hover} share 3 rules
+
 Run it in a verbose mode to see all the duplicated styles.
 
     $ csscss -v path/to/styles.css
 
+Run it against remote files by passing a valid URL.
+
+    $ csscss -v http://example.com/css/main.css
+
 You can also choose a minimum number of matches, which will ignore any
 rulesets that have fewer matches.
 
     $ csscss -n 10 -v path/to/style.css # ignores rulesets with < 10 matches
 
+If you prefer writing in sass, you can also parse your sass/scss files.
+
+    $ gem install sass
+    $ csscss path/to/style.scss
+
+
 ## I found bugs ##
 
 This is still a new and evolving project. I heartily welcome feedback.
@@ -45,8 +60,8 @@ output you expect to see.
 ## Who are you? ##
 
 My name is [Zach Moazeni](https://twitter.com/zmoazeni). I work for [an
-awesome company](http://www.getharvest.com/), which [is
-hiring!](http://www.getharvest.com/careers).
+awesome company](http://www.getharvest.com/). And [we're
+hiring!](http://www.getharvest.com/careers)
 
 ## I'm a dev, I can help ##
 

data/csscss.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = Csscss::VERSION
   gem.authors       = ["Zach Moazeni"]
   gem.email         = ["zach.moazeni@gmail.com"]
-  gem.description   = %q{A CSS redundancy analyzer that analyzes redundancy.}
-  gem.summary       = %q{csscss will parse any CSS files you give it and let you know which rulesets have duplicated declarations.}
+  gem.summary       = %q{A CSS redundancy analyzer that analyzes redundancy.}
+  gem.description   = %q{csscss will parse any CSS files you give it and let you know which rulesets have duplicated declarations.}
   gem.homepage      = "http://zmoazeni.github.com/csscss/"
 
   gem.files         = `git ls-files`.split($/)
@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "parslet", "~> 1.5"
+  gem.add_dependency "colorize"
 end

data/lib/csscss/cli.rb

@@ -1,9 +1,11 @@
 module Csscss
   class CLI
     def initialize(argv)
-      @argv = argv
+      @argv    = argv
       @verbose = false
+      @color   = true
       @minimum = 3
+      @compass = false
     end
 
     def run
@@ -12,8 +14,32 @@ module Csscss
     end
 
     def execute
+
       all_redundancies = @argv.map do |filename|
-        contents = File.read(filename)
+        contents = if %w(.scss .sass).include?(File.extname(filename).downcase) && !(filename =~ URI.regexp)
+          begin
+            require "sass"
+          rescue LoadError
+            puts "Must install sass gem before parsing sass/scss files"
+            exit 1
+          end
+
+          sass_options = {cache:false}
+          sass_options[:load_paths] = Compass.configuration.sass_load_paths if @compass
+          begin
+            Sass::Engine.for_file(filename, sass_options).render
+          rescue Sass::SyntaxError => e
+            if e.message =~ /compass/ && !@compass
+              puts "Enable --compass option to use compass's extensions"
+              exit 1
+            else
+              raise e
+            end
+          end
+        else
+          open(filename) {|f| f.read }
+        end
+
         RedundancyAnalyzer.new(contents).redundancies(@minimum)
       end
 
@@ -30,7 +56,8 @@ module Csscss
       if @json
         puts JSONReporter.new(combined_redundancies).report
       else
-        puts Reporter.new(combined_redundancies).report(@verbose)
+        report = Reporter.new(combined_redundancies).report(verbose:@verbose, color:true)
+        puts report unless report.empty?
       end
 
     rescue Parslet::ParseFailed => e
@@ -48,6 +75,10 @@ module Csscss
           @verbose = v
         end
 
+        opts.on("--[no-]color", "Colorizes output") do |c|
+          @color = c
+        end
+
         opts.on("-n", "--num N", Integer, "Print matches with at least this many rules. Defaults to 3") do |n|
           @minimum = n
         end
@@ -57,6 +88,17 @@ module Csscss
           exit
         end
 
+        opts.on("--[no-]compass", "Enables compass extensions when parsing sass/scss") do |compass|
+          if @compass = compass
+            begin
+              require "compass"
+            rescue LoadError
+              puts "Must install compass gem before enabling its extensions"
+              exit 1
+            end
+          end
+        end
+
         opts.on("-j", "--[no-]json", "Output results in JSON") do |j|
           @json = j
         end

data/lib/csscss/parser/css.rb

@@ -20,6 +20,8 @@ module Csscss
           comment.repeat(1) | space?
         }
 
+        rule(:blank_attribute) { str(";") >> space? }
+
         rule(:attribute) {
           match["^:{}"].repeat(1).as(:property) >>
           str(":") >>
@@ -33,7 +35,7 @@ module Csscss
             match["^{}"].repeat(1).as(:selector) >>
             str("{") >>
             space? >>
-            (comment | attribute).repeat(0).as(:properties) >>
+            (comment | attribute | blank_attribute).repeat(0).as(:properties) >>
             str("}") >>
             space?
           ).as(:ruleset)
@@ -50,7 +52,6 @@ module Csscss
           ).as(:nested_ruleset)
         }
 
-        #rule(:blocks) { (nested_ruleset.as(:nested) | ruleset).repeat(0).as(:blocks) }
         rule(:blocks) {
           space? >> (comment | nested_ruleset | ruleset).repeat(1).as(:blocks) >> space?
         }

data/lib/csscss/redundancy_analyzer.rb

@@ -1,3 +1,4 @@
+# TODO: this class really needs some work. It works, but it is horrid.
 module Csscss
   class RedundancyAnalyzer
     def initialize(raw_css)

data/lib/csscss/reporter.rb

@@ -4,20 +4,28 @@ module Csscss
       @redundancies = redundancies
     end
 
-    def report(verbose = false)
+    def report(options = {})
+      verbose      = options.fetch(:verbose, false)
+      should_color = options.fetch(:color, true)
+
       io = StringIO.new
       @redundancies.each do |selector_groups, declarations|
-        selector_groups = selector_groups.map {|selectors| "{#{selectors}}" }
+        selector_groups = selector_groups.map {|selectors| maybe_color("{#{selectors}}", :red, should_color) }
         last_selector = selector_groups.pop
         count = declarations.size
-        io.puts %Q(#{selector_groups.join(", ")} and #{last_selector} share #{count} rule#{"s" if count > 1})
+        io.puts %Q(#{selector_groups.join(", ")} AND #{last_selector} share #{maybe_color(count, :red, should_color)} rule#{"s" if count > 1})
         if verbose
-          declarations.each {|dec| io.puts "  - #{dec}" }
+          declarations.each {|dec| io.puts(maybe_color("  - #{dec}", :yellow, should_color)) }
         end
       end
 
       io.rewind
       io.read
     end
+
+    private
+    def maybe_color(string, color, condition)
+      condition ? string.to_s.colorize(color) : string
+    end
   end
 end

data/lib/csscss/version.rb

@@ -1,3 +1,3 @@
 module Csscss
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/csscss.rb

@@ -1,7 +1,9 @@
 require "stringio"
 require "optparse"
 require "json"
+require "open-uri"
 
+require "colorize"
 require "parslet"
 require "csscss/parslet_optimizations"
 

data/test/csscss/parser/css_test.rb

@@ -128,6 +128,12 @@ module Csscss::Parser
           rs(sel("h1"), [dec("outline", "1px")])
         ])
       end
+
+      it "ignores double semicolons" do
+        trans("h1 { display:none;;}").must_equal([
+          rs(sel("h1"), [dec("display", "none")])
+        ])
+      end
     end
   end
 end

data/test/csscss/reporter_test.rb

@@ -12,22 +12,27 @@ module Csscss
       })
 
      expected =<<-EXPECTED
-{.foo} and {.bar} share 2 rules
-{h1, h2}, {.foo} and {.baz} share 1 rule
-{h1, h2} and {.bar} share 1 rule
+{.foo} AND {.bar} share 2 rules
+{h1, h2}, {.foo} AND {.baz} share 1 rule
+{h1, h2} AND {.bar} share 1 rule
 EXPECTED
-     reporter.report.must_equal expected
+     reporter.report(color:false).must_equal expected
 
      expected =<<-EXPECTED
-{.foo} and {.bar} share 2 rules
+{.foo} AND {.bar} share 2 rules
   - width: 1px
   - border: black
-{h1, h2}, {.foo} and {.baz} share 1 rule
+{h1, h2}, {.foo} AND {.baz} share 1 rule
   - display: none
-{h1, h2} and {.bar} share 1 rule
+{h1, h2} AND {.bar} share 1 rule
   - position: relative
 EXPECTED
-     reporter.report(true).must_equal expected
+     reporter.report(verbose:true, color:false).must_equal expected
+    end
+
+    it "prints a new line if there is nothing" do
+      reporter = Reporter.new({})
+      reporter.report().must_equal ""
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csscss
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -27,7 +27,24 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-description: A CSS redundancy analyzer that analyzes redundancy.
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: csscss will parse any CSS files you give it and let you know which rulesets
+  have duplicated declarations.
 email:
 - zach.moazeni@gmail.com
 executables:
@@ -103,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4598443269162371706
+      hash: -2897207436893680163
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -112,14 +129,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4598443269162371706
+      hash: -2897207436893680163
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: csscss will parse any CSS files you give it and let you know which rulesets
-  have duplicated declarations.
+summary: A CSS redundancy analyzer that analyzes redundancy.
 test_files:
 - test/csscss/json_reporter_test.rb
 - test/csscss/parser/background_test.rb