octopress-ink 1.0.0.alpha.40 → 1.0.0.alpha.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84fb3edc066bb60dd8d87bb25cd335d0b0d0c996
-  data.tar.gz: 36a986d15251fca1611d23c576321a17fabc4032
+  metadata.gz: 7cafd4614b86a0c2ee67bd091d9603518488deb2
+  data.tar.gz: 89ed549eaa1b6fd06225f005229ac923ac6cc73e
 SHA512:
-  metadata.gz: bc9393404392e1537419199a97a1395aa148abeff3bb27cd984e395f68d39e6e017c93631906074909ecced339c9848e66ccbce21fbe4d0ab4df549d3ccfeed4
-  data.tar.gz: d45fc65a409dc90a5b32962a24e7eca7ea6313ee06043f2ff51372359d3019cd2508d5b9bcf6771ec90b16d275cc70199397e908168ab462170e871acb6f5d21
+  metadata.gz: c89bec5e91f8579d7a0daf2f218cc920dc4f0f0c3ce416207c00635c3b94bb833d0f39ec7ae65c2a79189c5609a72028cbdfc8b4b8da658fdcf7736be3d0c1cb
+  data.tar.gz: 917bcefdc14014139f9eb56125f38bf64b94d5c18cf8524c46aae20d10898858b3572c1954ff2770ae59ea5789164a92ecf27415c9624bc37978f5746c1676dd

data/lib/octopress-ink.rb

@@ -45,7 +45,7 @@ module Octopress
 
     def self.site(options={})
       log_level = Jekyll.logger.log_level
-      Jekyll.logger.log_level = Jekyll::Stevenson::WARN
+      Jekyll.logger.log_level = Jekyll::Stevenson::ERROR
       @site ||= Jekyll::Site.new(Jekyll.configuration(options))
       Jekyll.logger.log_level = log_level
       @site
@@ -134,6 +134,10 @@ module Octopress
       end
     end
 
+    def self.gem_dir(*subdirs)
+      File.expand_path(File.join(File.dirname(__FILE__), '../..', *subdirs))
+    end
+
     def self.copy_doc(source, dest)
       contents = File.open(source).read
       contents.sub!(/^# (.*)$/, "#{doc_title('\1').strip}")
@@ -168,6 +172,7 @@ Liquid::Template.register_tag('yield', Octopress::Ink::Tags::YieldTag)
 Liquid::Template.register_tag('wrap', Octopress::Ink::Tags::WrapTag)
 Liquid::Template.register_tag('abort', Octopress::Ink::Tags::AbortTag)
 Liquid::Template.register_tag('_', Octopress::Ink::Tags::LineCommentTag)
+Liquid::Template.register_tag('doc_url', Octopress::Ink::Tags::DocUrlTag)
 
 require 'octopress-ink/plugins/ink'
 require 'octopress-ink/plugins/asset_pipeline'

data/lib/octopress-ink/assets/doc_page.rb

@@ -23,7 +23,7 @@ module Octopress
         end
 
         def plugin_path
-          File.join(plugin_dir, dir, file)
+          File.join(plugin_dir, page_dir, file)
         end
 
         def source_dir
@@ -40,7 +40,8 @@ module Octopress
           @page.data['layout'] = 'docs'
           @page.data['plugin'] = { 
             'name' => @plugin.name, 
-            'slug' => @plugin.slug
+            'slug' => @plugin.slug,
+            'docs_base_path' => plugin.docs_base_path
           }
           @page.data['doc_pages'] = @plugin.doc_pages
           @page

data/lib/octopress-ink/assets/sass.rb

@@ -2,7 +2,7 @@ module Octopress
   module Ink
     module Assets
       class Sass < Stylesheet
-        def initialize(plugin, base, file, media)
+        def initialize(plugin, base, file)
           @plugin = plugin
           @base = base
           @file = file

data/lib/octopress-ink/assets/stylesheet.rb

@@ -3,7 +3,7 @@ module Octopress
     module Assets
       class Stylesheet < Asset
 
-        def initialize(plugin, base, file, media)
+        def initialize(plugin, base, file)
           @plugin = plugin
           @file = file
           @base = base

data/lib/octopress-ink/commands.rb

@@ -1,7 +1,7 @@
 module Octopress
   module Ink
     module Commands
-      require 'octopress-ink/commands/info'
+      require 'octopress-ink/commands/list'
       require 'octopress-ink/commands/copy'
 
       class Ink < Octopress::Command
@@ -9,10 +9,14 @@ module Octopress
         def self.init_with_program(p)
           p.command(:ink) do |c|
             c.version Octopress::Ink::VERSION
-            c.description "Get informationa about and work with Octopress Ink plugins."
+            c.description "Work with your Octopress Ink plugins."
             c.syntax "ink <subcommand>"
 
-            Info.process_command(c)
+            c.action do |args, options|
+              puts c if args.empty?
+            end
+
+            List.process_command(c)
             Copy.process_command(c)
           end
         end

data/lib/octopress-ink/commands/helpers.rb

@@ -6,7 +6,8 @@ module Octopress
           c.option "layouts", "--layouts", "#{action} only layouts"
           c.option "includes", "--includes", "#{action} only includes"
           c.option "pages", "--pages", "#{action} only pages"
-          c.option "stylesheets", "--stylesheets", "#{action} only Stylesheets"
+          c.option "stylesheets", "--stylesheets", "#{action} only Stylesheets (CSS and Sass)"
+          c.option "css", "--css", "#{action} only CSS files"
           c.option "sass", "--sass", "#{action} only Sass files"
           c.option "javascripts", "--javascripts", "#{action} only Javascripts"
           c.option "images", "--images", "#{action} only images"

data/lib/octopress-ink/commands/{info.rb → list.rb}

@@ -1,10 +1,10 @@
 module Octopress
   module Ink
     module Commands
-      class Info
+      class List
         def self.process_command(p)
-          p.command(:info) do |c|
-            c.syntax "octopress ink info [plugin] [options]"
+          p.command(:list) do |c|
+            c.syntax "list [plugin] [options]"
             c.description "Get info about octopress ink plugins"
             c.option "all", "--all", "List all plugins and their assets"
             CommandHelpers.add_asset_options(c, 'List')

data/lib/octopress-ink/plugin.rb

@@ -9,7 +9,7 @@ module Octopress
       }
 
       attr_reader   :name, :type, :assets_path, :local, :website, :description, :version,
-                    :layouts_dir, :css_dir, :javascripts_dir, :files_dir, :includes_dir, :images_dir,
+                    :layouts_dir, :stylesheets_dir, :javascripts_dir, :files_dir, :includes_dir, :images_dir,
                     :layouts, :includes, :images, :fonts, :files, :pages, :docs
 
       def initialize
@@ -23,8 +23,7 @@ module Octopress
         @images_dir        = 'images'
         @includes_dir      = 'includes'
         @javascripts_dir   = 'javascripts'
-        @css_dir           = 'stylesheets'
-        @sass_dir          = 'stylesheets'
+        @stylesheets_dir   = 'stylesheets'
         @config_file       = 'config.yml'
         @layouts           = []
         @includes          = []
@@ -62,13 +61,14 @@ module Octopress
           add_docs
           add_files
           add_pages
+          add_stylesheets
         end
       end
 
       def add_assets; end
 
       def stylesheets
-        css.clone.concat sass
+        css.clone.concat sass_without_partials
       end
 
       def config
@@ -110,17 +110,19 @@ module Octopress
       #
       def doc_pages
         if !@docs.empty?
-          @docs.clone.map do |d|
-            page_data = d.page.data
-            title   = page_data['link_title'] || page_data['title']
-            title ||= File.basename(d.file, '.*')
-            url = File.join(docs_base_path, d.file)
+          @docs.clone.map { |d|
+            page = d.page
+            title   = page.data['link_title'] || page.data['title'] || page.basename
+            url = File.join('/', docs_base_path, page.url.sub('index.html', ''))
 
             {
               'title' => title,
               'url' => url
             }
-          end
+          }.sort_by { |i| 
+            # Sort by depth of url
+            i['url'].split('/').size
+          }
         end
       end
 
@@ -194,6 +196,12 @@ module Octopress
         message = ''
         no_assets = []
 
+        if options['stylesheets']
+          options['css'] = true
+          options['sass'] = true
+          options.delete('stylesheets')
+        end
+
         select_assets(options).each do |name, assets|
           next if assets.size == 0
           if name == 'docs'
@@ -243,46 +251,59 @@ module Octopress
         end
       end
 
+      def add_stylesheets
+        find_assets(@stylesheets_dir).each do |asset|
+          if File.extname(asset) =~ /s[ca]ss/
+            @sass << Assets::Sass.new(self, @stylesheets_dir, asset)
+          else
+            @css << Assets::Stylesheet.new(self, @stylesheets_dir, asset)
+          end
+        end
+      end
+
       def add_layouts
-        @layouts = find_assets(@layouts_dir, Assets::Layout)
+        @layouts = add_new_assets(@layouts_dir, Assets::Layout)
       end
 
       def add_includes
-        @includes = find_assets(@includes_dir, Assets::Asset)
+        @includes = add_new_assets(@includes_dir, Assets::Asset)
       end
 
       def add_pages
-        @pages = find_assets(@pages_dir, Assets::PageAsset)
+        @pages = add_new_assets(@pages_dir, Assets::PageAsset)
       end
 
       def add_docs
-        @docs = find_assets(@docs_dir, Assets::DocPageAsset)
+        @docs = add_new_assets(@docs_dir, Assets::DocPageAsset)
       end
 
       def add_files
-        @files = find_assets(@files_dir, Assets::FileAsset)
+        @files = add_new_assets(@files_dir, Assets::FileAsset)
       end
 
       def add_javascripts
-        @javascripts = find_assets(@javascripts_dir, Assets::Javascript)
+        @javascripts = add_new_assets(@javascripts_dir, Assets::Javascript)
       end
 
       def add_fonts
-        @fonts = find_assets(@fonts_dir, Assets::Asset)
+        @fonts = add_new_assets(@fonts_dir, Assets::Asset)
       end
 
       def add_images
-        @images = find_assets(@images_dir, Assets::Asset)
+        @images = add_new_assets(@images_dir, Assets::Asset)
+      end
+
+      def add_new_assets(dir, asset_type)
+        find_assets(dir).map do |asset|
+          asset_type.new(self, dir, asset)
+        end
       end
 
-      def find_assets(dir, asset_type)
-        found = []
+      def find_assets(dir)
         full_dir = File.join(@assets_path, dir)
-        glob_assets(full_dir).each do |file|
-          asset = file.sub(full_dir+'/', '')
-          found << asset_type.new(self, dir, asset)
+        glob_assets(full_dir).map do |file|
+          file.sub(full_dir+'/', '')
         end
-        found
       end
 
       def glob_assets(dir)
@@ -290,21 +311,21 @@ module Octopress
         Find.find(dir).to_a.reject {|f| File.directory? f }
       end
 
-      def add_css(file, media=nil)
-        @css << Assets::Stylesheet.new(self, @css_dir, file, media)
-      end
+      #def add_css(file, media=nil)
+        #@css << Assets::Stylesheet.new(self, @stylesheets_dir, file, media)
+      #end
 
-      def add_sass(file, media=nil)
-        @sass << Assets::Sass.new(self, @sass_dir, file, media)
-      end
+      #def add_sass(file, media=nil)
+        #@sass << Assets::Sass.new(self, @sass_dir, file, media)
+      #end
 
-      def add_css_files(files, media=nil)
-        files.each { |f| add_css(f, media) }
-      end
+      #def add_css_files(files, media=nil)
+        #files.each { |f| add_css(f, media) }
+      #end
 
-      def add_sass_files(files, media=nil)
-        files.each { |f| add_sass(f, media) }
-      end
+      #def add_sass_files(files, media=nil)
+        #files.each { |f| add_sass(f, media) }
+      #end
 
       def remove_jekyll_assets(files)
         files.each {|f| f.remove_jekyll_asset }
@@ -318,6 +339,13 @@ module Octopress
 
       def copy_asset_files(path, options)
         copied = []
+
+        if options['stylesheets']
+          options['css'] = true
+          options['sass'] = true
+          options.delete('stylesheets')
+        end
+
         select_assets(options).each do |name, assets|
           next if name == 'docs'
           assets.each { |a| copied << a.copy(path) }
@@ -345,6 +373,10 @@ module Octopress
         @sass.reject{|f| f.disabled? }
       end
 
+      def sass_without_partials
+        sass.reject{|f| f.file =~ /^_/ }
+      end
+
       def javascripts
         @javascripts.reject{|f| f.disabled? }
       end

data/lib/octopress-ink/plugins/ink.rb

@@ -3,7 +3,7 @@ class Ink < Octopress::Ink::Plugin
     {
       name:        "Octopress Ink",
       slug:        "ink",
-      assets_path: File.expand_path(File.join(File.dirname(__FILE__), '../../../assets')),
+      assets_path: Octopress::Ink.gem_dir('assets'),
       version:     Octopress::Ink::VERSION,
       description: "Octopress Ink is a plugin framework for Jekyll",
       website:     "http://octopress.org/docs/ink"
@@ -13,5 +13,13 @@ class Ink < Octopress::Ink::Plugin
   def docs_base_path
     'docs/ink'
   end
+
+  def info(options)
+    if options['docs']
+      super
+    else
+      ''
+    end
+  end
 end
 

data/lib/octopress-ink/tags.rb

@@ -14,6 +14,7 @@ module Octopress
       autoload :WrapTag,              'octopress-ink/tags/wrap'
       autoload :AbortTag,             'octopress-ink/tags/abort'
       autoload :LineCommentTag,       'octopress-ink/tags/line_comment'
+      autoload :DocUrlTag,            'octopress-ink/tags/doc_url'
     end
   end
 end

data/lib/octopress-ink/tags/doc_url.rb

@@ -0,0 +1,18 @@
+# For plugin authors who need to generate urls pointing to ther doc pages.
+
+module Octopress
+  module Ink
+    module Tags
+      class DocUrlTag < Liquid::Tag
+        def initialize(tag_name, markup, tokens)
+          super
+          @url = markup.strip
+        end
+
+        def render(context)
+          '/' + File.join(context['page']['plugin']['docs_base_path'], @url)
+        end
+      end
+    end
+  end
+end

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.alpha.40"
+    VERSION = "1.0.0.alpha.41"
   end
 end

data/octopress-ink.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "jekyll", "~> 1.4.3"
   spec.add_runtime_dependency "sass", "~> 3.3.0"
 
-  spec.add_development_dependency "octopress", "~> 3.0.0.alpha8"
+  spec.add_development_dependency "octopress"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry-debugger"

data/test/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gem "octopress-ink", path: "../"
 gem "pry-debugger"
-#gem "octopress", path: "../../cli"
+gem "octopress", path: "../../cli"

data/test/plugins/awesome-sauce/plugin.rb

@@ -9,12 +9,6 @@ class TestPlugin < Octopress::Ink::Plugin
       description: "Test some plugins y'all"
     }
   end
-
-  def add_assets
-    add_css 'plugin-test.css'
-    add_css 'plugin-media-test.css', 'print'
-    super
-  end
 end
 
 Octopress::Ink.register_plugin(TestPlugin)

data/test/plugins/test-theme/plugin.rb

@@ -9,13 +9,6 @@ class TestTheme < Octopress::Ink::Plugin
       assets_path:  File.expand_path(File.dirname(__FILE__))
     }
   end
-  
-  def add_assets
-    add_css_files ['theme-test.css', 'theme-test2.css']
-    add_css 'theme-media-test@print.css'
-    add_css 'disable-this.css'
-    add_sass_files ['main.scss', 'disable.sass']
-  end
 end
 
 Octopress::Ink.register_plugin(TestTheme)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.40
+  version: 1.0.0.alpha.41
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -42,16 +42,16 @@ dependencies:
   name: octopress
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0.alpha8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ files:
 - lib/octopress-ink/commands.rb
 - lib/octopress-ink/commands/copy.rb
 - lib/octopress-ink/commands/helpers.rb
-- lib/octopress-ink/commands/info.rb
+- lib/octopress-ink/commands/list.rb
 - lib/octopress-ink/configuration.rb
 - lib/octopress-ink/filters.rb
 - lib/octopress-ink/generators/plugin_assets.rb
@@ -149,6 +149,7 @@ files:
 - lib/octopress-ink/tags/assign.rb
 - lib/octopress-ink/tags/capture.rb
 - lib/octopress-ink/tags/content_for.rb
+- lib/octopress-ink/tags/doc_url.rb
 - lib/octopress-ink/tags/filter.rb
 - lib/octopress-ink/tags/include.rb
 - lib/octopress-ink/tags/javascript.rb
@@ -238,7 +239,7 @@ files:
 - test/plugins/awesome-sauce/pages/test_pages/one.html
 - test/plugins/awesome-sauce/pages/test_pages/two.html
 - test/plugins/awesome-sauce/plugin.rb
-- test/plugins/awesome-sauce/stylesheets/plugin-media-test.css
+- test/plugins/awesome-sauce/stylesheets/plugin-media-test@print.css
 - test/plugins/awesome-sauce/stylesheets/plugin-test.css
 - test/plugins/test-theme/config.yml
 - test/plugins/test-theme/files/disabled-file.txt
@@ -415,7 +416,7 @@ test_files:
 - test/plugins/awesome-sauce/pages/test_pages/one.html
 - test/plugins/awesome-sauce/pages/test_pages/two.html
 - test/plugins/awesome-sauce/plugin.rb
-- test/plugins/awesome-sauce/stylesheets/plugin-media-test.css
+- test/plugins/awesome-sauce/stylesheets/plugin-media-test@print.css
 - test/plugins/awesome-sauce/stylesheets/plugin-test.css
 - test/plugins/test-theme/config.yml
 - test/plugins/test-theme/files/disabled-file.txt