livingstyleguide 1.2.0.pre.1 → 1.2.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86825c04643629696331540ff589ba16fb57d592
-  data.tar.gz: 8b7c01b7e88a6bfd3af8ba4616d7101a5928ce4f
+  metadata.gz: 055e627e9615c0dfd25421a891676beeeb049e2e
+  data.tar.gz: 1bc6c60bf8257467fe1135fd39111cd5a5af6e70
 SHA512:
-  metadata.gz: 5cacdc1aca7c7da0e9bd6a5b65877daa7ec01eab7b52f438c502fd7b19b12a5a1c8d12dd16634aa1003ef5921f1bdb2fb4b5ed03cf2fd8861bc4ee69910fbae2
-  data.tar.gz: 278a316fe32545e1c046e7be77f1f2fb2e2f5690553e5fcd6ddd712e2dfe61ca2e2c14adddbec0d4ddb2375368ef8444421d3da1a90307a23c5b7a257d55b58b
+  metadata.gz: 46805c97d4f2325a687659685208970c0406e6eee12bea6e61a9b2e41aa7e150ba40d6876190621391d3cafc748b51b6df3c2821f075522b5898750f0e7c7dd2
+  data.tar.gz: 3418637902ee95d9342211657fc42ec4d159c3d39078a0f775ef38e84aa0bdc678c449afbad32ec805f156adf90181b9865b1189e33c0e950f191660f7508199

data/lib/livingstyleguide/command_line_interface.rb

@@ -9,16 +9,41 @@ require 'tilt'
 module LivingStyleGuide
   class CommandLineInterface < Thor
 
-    desc 'compile filename', 'Compiles the living style guide to HTML.'
-    def compile(file)
-      output_file = file.sub(/\.lsg$/, '')
-      if defined?(Compass)
-        Compass.add_project_configuration 
-        output_file.sub! /^#{Compass.configuration.sass_dir}/, Compass.configuration.css_dir
+    desc 'compile input_file output_file', 'Compiles the living style guide to HTML.'
+    def compile(input_file = nil, output_file = nil)
+      template = LivingStyleGuide::TiltTemplate.new(input_file) do
+        input(input_file)
+      end
+      output template.render, input_file, output_file
+    end
+
+    desc 'version', 'Shows the current version of the Gem'
+    def version
+      puts "LivingStyleGuide #{LivingStyleGuide::VERSION}"
+    end
+
+    private
+    def input(input_file = nil)
+      @input ||= if input_file.nil?
+        $stdin.read
+      else
+        File.read(input_file)
+      end
+    end
+
+    private
+    def output(html, input_file = nil, output_file = nil)
+      if input_file.nil?
+        puts html
+      else
+        output_file = input_file.sub(/(\.html)?\.lsg$/, '.html') if output_file.nil?
+        if defined?(Compass)
+          Compass.add_project_configuration
+          output_file = output_file.sub(/^#{Compass.configuration.sass_dir}/, Compass.configuration.css_dir)
+        end
+        File.write output_file, html
+        puts "Successfully generated a living style guide at #{output_file}."
       end
-      html = Tilt.new(file).render
-      File.write output_file, html
-      puts "Successfully generated a living style guide at #{output_file}."
     end
 
   end

data/lib/livingstyleguide/engine.rb

@@ -137,6 +137,8 @@ module LivingStyleGuide
         next unless sass_filename.is_a?(String)
         glob = "#{sass_filename.sub(/\.s[ac]ss$/, '')}.md"
         Dir.glob(glob) do |markdown_filename|
+          next if files.include?(markdown_filename)
+
           files << markdown_filename
           @markdown << File.read(markdown_filename)
         end
@@ -209,4 +211,3 @@ module LivingStyleGuide
   end
 
 end
-

data/lib/livingstyleguide/example.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'minisyntax'
 require 'erb'
 require 'hooks'
@@ -74,7 +76,11 @@ class LivingStyleGuide::Example
 
   private
   def set_filter(key, argument = nil)
-    instance_exec argument, &@@filters[key.to_s.gsub('-', '_').to_sym]
+    name = key.to_s.gsub('-', '_').to_sym
+    unless @@filters.has_key?(name)
+      raise NameError.new("Undefined filter “@#{key}” called.", name)
+    end
+    instance_exec argument, &@@filters[name]
   end
 
   private

data/lib/livingstyleguide/tilt_template.rb

@@ -27,6 +27,9 @@ module LivingStyleGuide
       if defined?(Rails)
         options[:load_paths] += Rails.application.config.assets.paths
       end
+      if @file.nil?
+        options[:load_paths] << Dir.pwd
+      end
       if options[:template_location]
         options[:template_location].each do |path, short|
           options[:load_paths] << path
@@ -64,7 +67,7 @@ module LivingStyleGuide
 
     private
     def root
-      if @scope.respond_to?(:environment)
+      if @scope.respond_to?(:environment) and @scope.environment.respond_to?(:root)
         @scope.environment.root
       else
         find_root_path
@@ -73,7 +76,7 @@ module LivingStyleGuide
 
     private
     def find_root_path
-      path = File.dirname(@file)
+      path = @file.nil? ? Dir.pwd : File.dirname(@file)
       while path.length > 0 do
         if File.exists?(File.join(path, 'Gemfile')) or File.exists?(File.join(path, '.git'))
           break

data/lib/livingstyleguide/version.rb

@@ -1,3 +1,3 @@
 module LivingStyleGuide
-  VERSION = '1.2.0.pre.1'
+  VERSION = '1.2.0.pre.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.1
+  version: 1.2.0.pre.2
 platform: ruby
 authors:
 - Nico Hagenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax