guard-mthaml 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f46bd6bec946973cd5ff97c13a434eff208358c
-  data.tar.gz: 9c543e9541763958f01dd543d34746034eee4aa1
+  metadata.gz: 085ae92602c4830ad39e5985518ca897091166e4
+  data.tar.gz: 56b410d69ce89c6f65e9f59c93110d0e16ebe537
 SHA512:
-  metadata.gz: 615f137255871de2cc5c584e77e90fbb6eb95541a12154a3d76df8126b622030369d018543477a6d4fff4dfe0d62b32f6097a3878ac29afb5f1a4e4729be7ed7
-  data.tar.gz: 62f41d0aa92b9ac9018fdd202e50451b0ba7e9e1c462d3d9ea066d4d3877b711865855846d455826024e8014dd19e1729c650bf22fcdc0659907c31ab05645d1
+  metadata.gz: 2526368233ce1fdf50c9293808ec8522e175e3822fba8034b52c223ca55e1c7f4c5ff9b471540ca57d7cb8bf960cfc07b09855f8d372e6d457d4e28396363fdc
+  data.tar.gz: aa8da76a63075bcbfd5d0c94bb5b75471b8da8353354828022e3de5f720cb865fb195bc85279cc46cb5b6ff558f705d27759e45fc4f3a5e99c04e8905a5737bc

data/lib/guard/mthaml.rb

@@ -11,15 +11,21 @@ module Guard
         ###
         def initialize(options = {})
             options = {
-                :input => "views/src",
-                :output => "views",
-                :environment => "php",
-                :notifications => true,
-                :compress_output => false,
-                :static_files => false,
-                :run_at_start => true
+                input: "views/src",
+                output: "views",
+                environment: "php",
+                extension: nil,
+                notifications: true,
+                compress_output: false,
+                static_files: false,
+                run_at_start: true
             }.merge(options)
 
+            # Define extension if environment is nil
+            if options[:extension].nil?
+                options[:extension] = if options[:static_files] then "html" else options[:environment] end
+            end
+
             super(options)
 
             if options[:input]
@@ -69,13 +75,23 @@ module Guard
                 input_dir = Pathname.new(options[:input]).realpath
                 input_file = file.realpath
 
-                unless input_dir == file_dir
-                    output_dir = Pathname.new(options[:output]).realpath + file_dir.basename
-                    make_directory(output_dir)
-                else
+                puts file, file_dir, input_dir, input_file
+
+                # Simple check to see if we need to create any directories in the output
+                if file_dir == input_dir
+                    # File looks like it's in the base directory
                     output_dir = Pathname.new(options[:output]).realpath
+                else
+                    # Looks like we need to create a directory or two
+                    output_dir = Pathname.new(options[:output]).realpath + file_dir.to_s.gsub(input_dir.to_s, "")[1..-1]
                 end
 
+                puts output_dir
+
+                # Make directories if they don't already exist
+                make_directory(output_dir)
+
+                # Initiate compiler
                 compile_haml(input_file, output_dir)
             end
         end
@@ -101,26 +117,21 @@ module Guard
         ###
         def compile_haml(input, output)
 
-            ext = if options[:static_files]
-                ".html"
-            else
-                ".#{options[:environment]}"
-            end
-
             command = [
                 "php #{File.dirname(__FILE__)}/mthaml/compiler/MtHaml.php",
                 "--input #{input}",
                 "--output #{output}",
                 "--environment #{options[:environment]}",
+                "--extension #{options[:extension]}",
                 "--static_files #{options[:static_files]}",
-                "--compress_output #{options[:compress_output]}"
+                "--compress_output #{options[:compress_output]}",
             ].join " "
 
             begin
                 throw :task_has_failed unless system command
-                ::Guard::UI.info(color("write #{File.basename(input, ".*") + ext}", ";32")) if options[:notifications]
+                ::Guard::UI.info(color("write #{File.basename(input, ".*")}.#{options[:extension]}", ";32")) if options[:notifications]
             rescue StandardError => error
-                ::Guard::UI.error(color("error #{File.basename(input, ".*") + ext} : #{error}", ";31")) if options[:notifications]
+                ::Guard::UI.error(color("error #{File.basename(input, ".*")}.#{options[:extension]} : #{error}", ";31")) if options[:notifications]
             end
         end
 

data/lib/guard/mthaml/compiler/MtHaml.php

@@ -42,6 +42,14 @@ class MtHamlCompiler {
      */
     private $environment;
 
+    /**
+     * @var {String}
+     *   Extension of output file
+     *
+     * @since 0.1.0
+     */
+    private $extension;
+
     /**
      * @var {Array}
      *   Array of options to be passed to MtHaml
@@ -124,7 +132,7 @@ class MtHamlCompiler {
         }
 
         /**
-         * Get the environment
+         * Set the environment
          */
         if( isset( $this->options['environment'] ) ) {
             $this->environment = $this->options['environment'];
@@ -132,6 +140,15 @@ class MtHamlCompiler {
             throw new \Exception( self::colorize( "No environment was passed into \$opts.", ";31" ) );
         }
 
+        /**
+         * Set the output extension
+         */
+        if( isset( $this->options['extension'] ) ) {
+            $this->extension = $this->options['extension'];
+        } else {
+            $this->extension = $this->environment;
+        }
+
         // Set the MtHaml environment
         self::set_environment();
     }
@@ -240,11 +257,10 @@ class MtHamlCompiler {
      */
     private function write() {
         if ( $this->output ) {
-            $extension = $this->options["static_files"] ? "html" : $this->environment;
             // Make sure our path is writable
             self::ensure_path_writable( $this->output_dir );
             // Render output
-            return file_put_contents( "$this->output_dir/" . basename( $this->input_file, ".haml" ) . ".$extension", $this->output );
+            return file_put_contents( "$this->output_dir/" . basename( $this->input_file, ".haml" ) . ".$this->extension", $this->output );
         } else {
             throw new \Exception( self::colorize( "It looks like `" . basename( $this->input_file ) . "` compiled without any output.", ";33" ) );
         }
@@ -254,7 +270,7 @@ class MtHamlCompiler {
 /**
  * Get passed arguments from Guard
  */
-$opts = getopt( "", array( "input:", "output:", "environment:", "static_files:", "compress_output:" ) );
+$opts = getopt( "", array( "input:", "output:", "environment:", "static_files:", "compress_output:", "extension:" ) );
 
 /**
  * Instantiate compiler and parse file with input from Guard
@@ -265,6 +281,7 @@ try {
         "output" => $opts["output"],
         "options" => array(
             "environment" => $opts["environment"],
+            "extension" => $opts["extension"],
             "static_files" => $opts["static_files"] === "true" ? true : false,
             "compress_output" => $opts["compress_output"] === "true" ? true : false
         )

data/lib/guard/mthaml/templates/Guardfile

@@ -4,6 +4,7 @@
 # :input           ("views/src") set input directory with haml files
 # :output          ("views")     set output directory for compiled files
 # :environment     ("php")       haml environment
+# :extension       (nil)         output file extension, uses environment if nil
 # :notifications   (true)        toggle guard notifications
 # :compress_output (false)       compress compiled haml files
 # :static_files    (false)       compile haml to static html

data/lib/guard/mthaml/version.rb

@@ -1,5 +1,5 @@
 module ::Guard
     class MtHamlVersion
-        VERSION = "0.2.5"
+        VERSION = "0.3.0"
     end
 end

data/vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit17e64cb9b57858533d303e3ace0ae982::getLoader();
+return ComposerAutoloaderInit7c72a395feca2c9cf06b47db0e557a37::getLoader();

data/vendor/composer/ClassLoader.php

@@ -56,7 +56,11 @@ class ClassLoader
 
     public function getPrefixes()
     {
-        return call_user_func_array('array_merge', $this->prefixesPsr0);
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+
+        return array();
     }
 
     public function getPrefixesPsr4()

data/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit17e64cb9b57858533d303e3ace0ae982
+class ComposerAutoloaderInit7c72a395feca2c9cf06b47db0e557a37
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit17e64cb9b57858533d303e3ace0ae982
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit17e64cb9b57858533d303e3ace0ae982', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit7c72a395feca2c9cf06b47db0e557a37', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit17e64cb9b57858533d303e3ace0ae982', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit7c72a395feca2c9cf06b47db0e557a37', 'loadClassLoader'));
 
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
@@ -44,7 +44,7 @@ class ComposerAutoloaderInit17e64cb9b57858533d303e3ace0ae982
     }
 }
 
-function composerRequire17e64cb9b57858533d303e3ace0ae982($file)
+function composerRequire7c72a395feca2c9cf06b47db0e557a37($file)
 {
     require $file;
 }

data/vendor/composer/installed.json

@@ -1,69 +1,4 @@
 [
-    {
-        "name": "mthaml/mthaml",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/arnaud-lb/MtHaml.git",
-            "reference": "86f094aa6e5036a349d59bb0c30c3088a3ee7b1b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/arnaud-lb/MtHaml/zipball/86f094aa6e5036a349d59bb0c30c3088a3ee7b1b",
-            "reference": "86f094aa6e5036a349d59bb0c30c3088a3ee7b1b",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "conflict": {
-            "mthaml/mthaml-bundle": "<1.1.0"
-        },
-        "require-dev": {
-            "coffeescript/coffeescript": "~1",
-            "erusev/parsedown": "*",
-            "leafo/lessphp": "*",
-            "leafo/scssphp": "*",
-            "michelf/php-markdown": "~1.3",
-            "oyejorge/less.php": "*",
-            "twig/twig": "~1.11"
-        },
-        "suggest": {
-            "cebe/markdown": "If you want to use :markdown filter",
-            "coffeescript/coffeescript": "If you want to use :coffee or :coffeescript filter",
-            "erusev/parsedown": "If you want to use :markdown filter",
-            "kzykhys/ciconia": "If you want to use :markdown filter",
-            "leafo/lessphp": "If you want to use :less filter",
-            "leafo/scssphp": "If you want to use :scss filter",
-            "michelf/php-markdown": "If you want to use :markdown filter",
-            "oyejorge/less.php": "If you want to use :less filter",
-            "twig/twig": "If you want to use Twig templating engine"
-        },
-        "time": "2014-10-10 20:23:22",
-        "type": "library",
-        "installation-source": "source",
-        "autoload": {
-            "psr-0": {
-                "MtHaml\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Arnaud Le Blanc",
-                "email": "arnaud.lb@gmail.com"
-            }
-        ],
-        "description": "HAML for PHP",
-        "homepage": "https://github.com/arnaud-lb/MtHaml",
-        "keywords": [
-            "HAML"
-        ]
-    },
     {
         "name": "coffeescript/coffeescript",
         "version": "1.3.1",
@@ -162,5 +97,70 @@
         "keywords": [
             "markdown"
         ]
+    },
+    {
+        "name": "mthaml/mthaml",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/arnaud-lb/MtHaml.git",
+            "reference": "86f094aa6e5036a349d59bb0c30c3088a3ee7b1b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/arnaud-lb/MtHaml/zipball/86f094aa6e5036a349d59bb0c30c3088a3ee7b1b",
+            "reference": "86f094aa6e5036a349d59bb0c30c3088a3ee7b1b",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "conflict": {
+            "mthaml/mthaml-bundle": "<1.1.0"
+        },
+        "require-dev": {
+            "coffeescript/coffeescript": "~1",
+            "erusev/parsedown": "*",
+            "leafo/lessphp": "*",
+            "leafo/scssphp": "*",
+            "michelf/php-markdown": "~1.3",
+            "oyejorge/less.php": "*",
+            "twig/twig": "~1.11"
+        },
+        "suggest": {
+            "cebe/markdown": "If you want to use :markdown filter",
+            "coffeescript/coffeescript": "If you want to use :coffee or :coffeescript filter",
+            "erusev/parsedown": "If you want to use :markdown filter",
+            "kzykhys/ciconia": "If you want to use :markdown filter",
+            "leafo/lessphp": "If you want to use :less filter",
+            "leafo/scssphp": "If you want to use :scss filter",
+            "michelf/php-markdown": "If you want to use :markdown filter",
+            "oyejorge/less.php": "If you want to use :less filter",
+            "twig/twig": "If you want to use Twig templating engine"
+        },
+        "time": "2014-10-10 20:23:22",
+        "type": "library",
+        "installation-source": "source",
+        "autoload": {
+            "psr-0": {
+                "MtHaml\\": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Arnaud Le Blanc",
+                "email": "arnaud.lb@gmail.com"
+            }
+        ],
+        "description": "HAML for PHP",
+        "homepage": "https://github.com/arnaud-lb/MtHaml",
+        "keywords": [
+            "HAML"
+        ]
     }
 ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-mthaml
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard