sasstool 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea4326315f0d5b54d4a67d44a563e9fdb85a81f27c6ce895a077c64cfa18d472
-  data.tar.gz: 2b87eb6577e7a46296680517478471de61eef0a6856e6dc8ea1a0336743fe8cb
+  metadata.gz: ef0bcf79ec7eb20aa6311274eeb54b1edf592a50db834554772f540f7cff8f81
+  data.tar.gz: aba3d1af516c8509486331de1028ae2de8cbce1490b6ff600c9bb9f609917289
 SHA512:
-  metadata.gz: f368d194b91e7403eada76463281c3c798bd5474c1bdbb968189f6e4e570432326281cd1a247e42f56f3ba6b9414895b4a1c16e164a0bc7032644dfe452943ab
-  data.tar.gz: e6fe091204da158e07ff1622fd3e7a929796bae70f631c0c3194ea0ec0000f196d0e2c934f9f98cbf95948eba069d0acca33cf88155a566ead193788ed71ee67
+  metadata.gz: 5c390ac0c5673e07cbf4c24bb24d9d076b221b41eeb375466d082a82c90ad31c21355bb074362646a0989d823769c442de87877040c35443c749878132dfb32a
+  data.tar.gz: c460510b330d6600e5b3134cfa5e861f72db2126a233aef93293d74ab93c10d7e25cef7dccf67e1868a4eea04f1f1c82857af8dca5bfdb2356175028766b12ff

data/README.md

@@ -1,8 +1,8 @@
-Sasstool
-==================================================
+# Sasstool
 
 [![Gem Version](https://badge.fury.io/rb/sasstool.svg)](https://badge.fury.io/rb/sasstool)
-[![Build Status](https://travis-ci.com/DannyBen/sasstool.svg?branch=master)](https://travis-ci.com/DannyBen/sasstool)
+[![Build Status](https://github.com/DannyBen/sasstool/workflows/Test/badge.svg)](https://github.com/DannyBen/sasstool/actions?query=workflow%3ATest)
+[![Maintainability](https://api.codeclimate.com/v1/badges/4cef96eefe9287ab6c90/maintainability)](https://codeclimate.com/github/DannyBen/sasstool/maintainability)
 
 ---
 
@@ -10,15 +10,17 @@ Sass (SassC) command line renderer with globbing import support.
 
 ---
 
-Installation
---------------------------------------------------
+## Installation
 
     $ gem install sasstool
 
 
+## Usage
 
-Usage
---------------------------------------------------
+You can use Sasstool from the command line, or from within ruby code.
+
+
+### Rendering from the command line
 
 ```
 $ sasstool --help
@@ -37,7 +39,7 @@ Options:
 
 Parameters:
   INFILE
-    Path to SCSS input file
+    Path to SCSS or SASS input file
 
   OUTDIR
     Path to CSS output directory. Can also be provided by an environment
@@ -50,4 +52,31 @@ Environment Variables:
 Examples:
   sasstool style/main.scss public/css
 
-```
+```
+
+
+### Rendering from Ruby code
+
+```ruby
+sass = Sasstool::Renderer.new 'path/to/main.scss'
+
+# Get the CSS string
+sass.render
+
+# Get the source map string
+sass.source_map
+
+# Save both CSS and source map
+sass.save 'target/directory'
+```
+
+
+## Contributing / Support
+
+If you experience any issue, have a question or a suggestion, or if you wish
+to contribute, feel free to [open an issue][issues].
+
+---
+
+[issues]: https://github.com/DannyBen/sasstool/issues
+

data/lib/sasstool/cli.rb

@@ -5,12 +5,9 @@ require_relative 'command'
 module Sasstool
   class CLI
     def self.router
-      router = MisterBin::Runner.new version: VERSION,
-        header: "SASS Tool"
-
-      router.route_all to: Command
-
-      router
+      MisterBin::Runner.new version: VERSION,
+        header: "SASS Tool",
+        handler: Command
     end
   end
 end

data/lib/sasstool/command.rb

@@ -6,7 +6,7 @@ module Sasstool
     usage "sasstool INFILE [OUTDIR --watch]"
     usage "sasstool (-h|--help)"
     
-    param "INFILE", "Path to SCSS input file"
+    param "INFILE", "Path to SCSS or SASS input file"
     param "OUTDIR", "Path to CSS output directory. Can also be provided by an environment variable"
     option "-w, --watch", "Watch the directory of the input file, and save on change"
     environment "SASSTOOL_OUTDIR", "Path to CSS output directory"
@@ -22,7 +22,7 @@ module Sasstool
 
     def watch
       dir = File.dirname args['INFILE']
-      glob = "#{dir}/**/*.scss"
+      glob = "#{dir}/**/*.s[ca]ss"
       Filewatcher.new(glob).watch do
         save
       end
@@ -34,7 +34,7 @@ module Sasstool
     end
 
     def renderer
-      @renderer ||= Renderer.new(args['INFILE'])
+      Renderer.new args['INFILE']
     end
 
     def outdir

data/lib/sasstool/importer.rb

@@ -4,7 +4,9 @@ module Sasstool
       if path.include? "*"
         dir = File.dirname parent_path
         glob = "#{dir}/#{path}"
-        files = Dir[glob].select { |file| File.extname(file) == '.scss' }
+        files = Dir[glob].select do |file|
+          ['.scss', '.sass'].include? File.extname(file)
+        end
 
         files.map do |file|
           Import.new File.expand_path(file)

data/lib/sasstool/renderer.rb

@@ -16,19 +16,35 @@ module Sasstool
       File.write "#{name}.map", source_map
     end
 
+    def sass?
+      path.end_with? 'sass'
+    end
+
+    def to_scss
+      SassC::Sass2Scss.convert file_content
+    end
+
   private
 
     def basename
-      @basename ||= File.basename(path).gsub(/scss$/, 'css')
+      @basename ||= File.basename(path).gsub(/s[ca]ss$/, 'css')
+    end
+
+    def file_content
+      @file_content ||= File.read(path)
     end
 
     def scss_content
-      scss_content ||= File.read(path)
+      @scss_content ||= scss_content!
+    end
+
+    def scss_content!
+      sass? ? to_scss : file_content
     end
 
     def options
       @options ||= {
-        source_map_file: "#{path.gsub(/scss$/, 'css')}.map",
+        source_map_file: "#{path.gsub(/s[ca]ss$/, 'css')}.map",
         source_map_contents: true,
         style: :nested,
         importer: Importer,

data/lib/sasstool/version.rb

@@ -1,3 +1,3 @@
 module Sasstool
-  VERSION = "0.1.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sasstool
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mister_bin
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 description: Sass command line renderer with globbing import support
 email: db@dannyben.com
 executables:
@@ -93,14 +93,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.14
 signing_key: 
 specification_version: 4
 summary: Sass command line renderer