scss_beautifier 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc623afd604466656fe65eba5a697b41bf713910
-  data.tar.gz: 8102f621efbb425b9916e2dff6e6aaf8c9af538d
+  metadata.gz: 6a3d388c808d3e8d767fa538e2383c6f18aa385f
+  data.tar.gz: 30e41286c9a23ffb74c3f55faf32c17270af9b4c
 SHA512:
-  metadata.gz: 94ae0713b700ead62c325ae961c01ab01b35c53e5150f1f316d05a4db9313dcb7fceb813e070f9d3338489e5f290b803336b8425cf54961053e30457dc229889
-  data.tar.gz: 09a959b4a7062aae05e48e6d87cc6157045de294b6771d7d3fb488da7a36daccf460a7a5965ed053a36b6a5356876e46691a693a34376069fbd004af9e10fb40
+  metadata.gz: b7617a95f4d89c08655812ea0d770f0ca319d5d8e4fd438c474b31dd8441f57e2b1102dee18d18e77190836b7f75056324898e8f799ea835dc24fc07f81be3bd
+  data.tar.gz: b1492970c8027594c1f2d42b00c94dc0d72fedaf522358631b960fc8ca0e4a3f3f3b24c1b197598d32b8997bc6ebd0778fb0f6077b5639e124d9fec568bf258a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scss_beautifier (0.1.8)
+    scss_beautifier (0.1.10)
       sass (~> 3.4)
 
 GEM

data/data/default_config.yml

@@ -1,3 +1,4 @@
+tab_style: "  "
 formatters:
 
   border_zero:

data/lib/scss_beautifier/cli.rb

@@ -4,17 +4,25 @@ module SCSSBeautifier
     # Takes an array of arguments
     # Returns exit code
     def run(args)
-      contents = File.read(ARGV.first)
+      options = Options.new.parse(args)
+
+      contents = File.read(args.first)
       engine = Sass::Engine.new(contents, cache: false, syntax: :scss)
 
       tree = engine.to_tree
-      Config.new(DEFAULT).formatters.each do |formatter|
+      config = Config.new(options[:config] || DEFAULT)
+
+      config.formatters.each do |formatter|
         formatter.visit(tree)
       end
 
-      puts SCSSBeautifier::Convert.visit(tree, {}, :scss)
-
+      output = SCSSBeautifier::Convert.visit(tree, {indent: config.tab_style}, :scss)
+      if options[:in_place]
+        File.write(args.first, output)
+      else
+        puts output
+      end
     end
 
   end
-end
+end

data/lib/scss_beautifier/config.rb

@@ -17,5 +17,9 @@ module SCSSBeautifier
         SCSSBeautifier::Formatters.const_get(formatter.split("_").map(&:capitalize).join)
       end
     end
+
+    def tab_style
+      @config["tab_style"] || "  "
+    end
   end
 end

data/lib/scss_beautifier/formatters/pseudo_element.rb

@@ -8,6 +8,7 @@ class SCSSBeautifier::Formatters::PseudoElement < Sass::Tree::Visitors::Base
 
   def check_pseudo(node)
     node.rule = Sass::Util.strip_string_array(node.rule.map { |r|
+      return r unless r.is_a?(String)
       require_double_colon = PSEUDO_ELEMENTS.index(r.split(":").last)
 
       colon_type = require_double_colon ? '::' : ':'

data/lib/scss_beautifier/formatters/selector.rb

@@ -1,7 +1,7 @@
 class SCSSBeautifier::Formatters::Selector < Sass::Tree::Visitors::Base
   def visit_rule(node)
     node.rule = node.rule.each do |rule|
-      rule.gsub!(/,/, ",\n")
+      rule.gsub!(/,/, ",\n") if rule.is_a?(String)
     end
     node.send(:try_to_parse_non_interpolated_rules)
   end

data/lib/scss_beautifier/options.rb

@@ -1,6 +1,6 @@
 require "optparse"
 
-module Lintrunner
+module SCSSBeautifier
   class Options
 
     attr_reader :options
@@ -8,81 +8,39 @@ module Lintrunner
     def initialize
       @options = {}
       @option_parser = OptionParser.new do |opts|
+        opts.version = SCSSBeautifier::VERSION
         add_banner(opts)
         add_config_option(opts)
-        add_context_option(opts)
-        add_include_path_option(opts)
-        add_reporter_option(opts)
-        add_ignore_option(opts)
-        add_colorize_option(opts)
+        add_in_place_option(opts)
       end
     end
 
     def parse(args)
       @option_parser.parse!(args)
-      add_defaults
       options[:path] = args.first if args.first
       options
     end
 
     private
 
-    def add_defaults
-      options[:config] ||= ".lintrunner_config"
-      options[:context] ||= Dir.pwd
-      options[:include_paths] = Array(options[:include_paths]) << options[:context]
-      options[:include_paths].uniq!
-      options[:reporter] ||= "text"
-      options[:path] = Dir.pwd
-      options[:ignore] ||= []
-    end
-
     def add_banner(opts)
       opts.banner = unindent(<<-BANNER)
-        Run multiple linters with various runners
+        Beautify your SCSS code
         Usage: #{opts.program_name} [options] [path]
       BANNER
     end
 
     def add_config_option(opts)
-      message = "the configuration file for lintrunner (default: .lintrunner_config)"
+      message = "the configuration file"
       opts.on("-c", "--config config", message, String) do |config|
         self.options[:config] = config
       end
     end
 
-    def add_context_option(opts)
-      message = "the path on which lintrunner will execute in (default: current path)"
-      opts.on("-x", "--context path", message, String) do |path|
-        self.options[:context] = Pathname.new(path).realpath.to_s
-      end
-    end
-
-    def add_include_path_option(opts)
-      message = "the paths to add to load paths (the context is in the load path)"
-      opts.on("--include_path path1,...", message, Array) do |paths|
-        self.options[:include_paths] = paths
-      end
-    end
-
-    def add_reporter_option(opts)
-      message = "the reporter that lintrunner uses to report results"
-      opts.on("--reporter reporter", message, String) do |reporter|
-        self.options[:reporter] = reporter
-      end
-    end
-
-    def add_ignore_option(opts)
-      message = "the messages to ignore for this lintrunner execution"
-      opts.on("--ignore messages", message, Array) do |messages|
-        self.options[:ignore] = messages
-      end
-    end
-
-    def add_colorize_option(opts)
-      message = "force colorized setting for output"
-      opts.on("--colorize", "--[no-]colorize", message) do |bool|
-        Rainbow.enabled = bool
+    def add_in_place_option(opts)
+      message = "whether to overwrite the file or not"
+      opts.on("-i", "--in-place", message) do |bool|
+        self.options[:in_place] = bool
       end
     end
 

data/lib/scss_beautifier/version.rb

@@ -1,3 +1,3 @@
 module SCSSBeautifier
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

data/lib/scss_beautifier.rb

@@ -11,6 +11,7 @@ require "sass"
 
 require "scss_beautifier/version"
 require "scss_beautifier/cli"
+require "scss_beautifier/options"
 require "scss_beautifier/config"
 
 # Our custom SCSS to SCSS converter

data/tmp/dump.txt

@@ -35,6 +35,8 @@ https://github.com/sasstools/sass-lint/blob/master/docs/rules/brace-style.md - i
 https://github.com/sasstools/sass-lint/blob/master/docs/rules/class-name-format.md
 https://github.com/sasstools/sass-lint/blob/master/docs/rules/empty-args.md
 
+Use interpolation over + when you want a string in the end (#{$degree}deg vs $degree + deg)
+
 whoa never seen these rules
 https://github.com/sasstools/sass-lint/blob/master/docs/rules/force-attribute-nesting.md
 https://github.com/sasstools/sass-lint/blob/master/docs/rules/force-element-nesting.md
@@ -46,6 +48,7 @@ https://github.com/sasstools/sass-lint/blob/master/docs/rules/id-name-format.md
 https://github.com/sasstools/sass-lint/blob/master/docs/rules/mixin-name-format.md
 
 https://github.com/sasstools/sass-lint/blob/master/docs/rules/no-warn.md
+how do maps look like? newlines separation?
 
 
 These are spacing rules that come out of the box:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_beautifier
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Ivan Tse
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass