octopress-ink 1.0.0.alpha.43 → 1.0.0.alpha.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db0b53411b0e6748e5281e9db9fa6ef247296b9e
-  data.tar.gz: 8ff58d71d3cd6c9b75ba143e072fca4ce169b906
+  metadata.gz: 0ddd087cd3f779c18b523d5f4feccfcb3b575b2f
+  data.tar.gz: 12126d852db51f062a0063516819319f554de313
 SHA512:
-  metadata.gz: 1c455972095fe4418cfaf5ec2e70c3a6cb1785cf8d0cd29989d433425240532aa3f62b92098c02d9316844bfbe62ee963ae05758fd74d21cfa799303d169eb56
-  data.tar.gz: f9e610a3b80b20731db06b95f43931988167fd2b9b58190703f6d029bc58bb600250085f96497e0e1459f65af08d7d38f313ef6829a106a4659ef21e58d3c8eb
+  metadata.gz: 141cf68d224be24a4e57860e87584dac4af215dbe0a9f2aa9b7e83f2bb9e2b5ebbb30abf7c11738290fed5077fb2088ae2eb71dfe01a1a3cca49e94bc772aa27
+  data.tar.gz: e0bdf61520091974cfebe8cd353cffa5a5dd8d5c0bdd6bbdd8b9b8fb6c1e52423018042bf74570cd56328dd621886e6877ed7c9a8d2c603ee76264510eb1b55f

data/assets/docs/creating-a-plugin.markdown

@@ -3,55 +3,44 @@ title: "Create an Octopress Ink Plugin"
 permalink: /guides/creating-a-plugin/
 ---
 
-If you haven't created a ruby gem for your plugin, check out [Creating a Gem]({% doc_url /guides/creating-a-gem/ %}).
+*This guide assumes you have already installed Git, and Ruby 1.9.3 or greater.*
 
-In this section we'll create an Octopress Ink plugin. Take a look at `lib/baconnaise.rb`. You should see
-something like this:
+Octopress Ink plugins are distributed as ruby gems so you'll probably need to create an acconut at [RubyGems.org](https://rubygems.org/sign_up) if you haven't yet. Also, be sure to install the [bundler](http://bundler.io) gem.
 
-```ruby
-require "baconnaise/version"
+## Creating a Plugin
 
-module Baconnaise
-  # Your code goes here...
-end
-```
-
-We'll require octopress-ink add a configuration method, and register the plugin with Octopress Ink plugin. Here's what `lib/baconnaise.rb` after we've done that.
+To create a new plugin from scratch run:
 
-```ruby
-require "baconnaise/version"
-require "octopress-ink"
+```sh
+octopress ink new cool_plugin
+```
 
-module Baconnaise
-  class InkPlugin < Octopress::Ink::Plugin
-    def configuration
-      {
-        # your configuration goes here.
-      }
-    end
-  end
-end
+This will add scaffolding for a gem-based plugin in the `cool_plugin` directory. To create a theme, add the `--theme` flag.  Here's what that will look like.
 
-# Register the plugin with Octopress Ink
-Octopress::Ink.register_plugin(Baconnaise::InkPlugin)
+```
+assets/
+  files/
+  fonts/
+  images/
+  includes/
+  javascripts/
+  layouts/
+  pages/
+  stylesheets/
+lib/
+  cool_plugin/
+    version.rb
+  cool_plugin.rb
+cool_plugin.gemspec
+Gemfile
+LICENSE.txt
+Rakefile
+README.md
 ```
 
-Now when Jekyll requires your plugin, it will register with Octopress Ink. The configuration options are as follows:
-
-{% render ./_configuration.markdown %}
+This is basically Bundler's gem scaffolding with a few additions.
 
-For Baconnaise, our configuration medthod will look like this:
+- Empty asset directories are added.
+- The gemspec requires `octopress-ink` as a runtime dependency.
+- A basic Octopress Ink plugin is added to `lib/cool_plugin.rb`.
 
-```ruby
-def configuration
-  {
-    name:        "Baconnaise",
-    slug:        "baconnaise",
-    assets_path: File.expand_path(File.join(File.dirname(__FILE__), '../assets')),
-    type:        "plugin",
-    version:     Baconnaise::VERSION,
-    description: "Baconnaise, because mistakes have never been this spreadable.",
-    website:     "http://baconnaise-craze.info/or/something/"
-  }
-end
-```

data/assets/docs/plugin-reference.markdown

@@ -3,7 +3,7 @@ title: "Octopress Ink Plugin Reference"
 permalink: /plugin-reference/
 ---
 
-Octopress Ink plugins should be distributed as ruby gems. If you don't know how to create a ruby gem, [follow this walkthrough]({% doc_url /guides/create-a-gem/ %}).
+Octopress Ink plugins should be distributed as Ruby gems. If you don't know how to create a ruby gem, [follow this walkthrough]({% doc_url /guides/create-a-gem/ %}).
 
 ### Plugin Template
 

data/lib/octopress-ink.rb

@@ -27,10 +27,22 @@ module Octopress
       require 'octopress-ink/commands'
     end
 
+    # Register a new plugin
+    # 
+    # plugin - A subclass of Plugin
+    #
     def self.register_plugin(plugin)
       Plugins.register_plugin(plugin)
     end
 
+    # Create a new plugin from a configuration hash
+    # 
+    # options - A hash of configuration options.
+    #
+    def self.new_plugin(options)
+      Plugins.register_plugin Plugin, options
+    end
+
     def self.version
       version = "Jekyll v#{Jekyll::VERSION}, "
       if defined? Octopress::VERSION
@@ -65,14 +77,14 @@ module Octopress
 
     # Prints a list of plugins and details
     #
-    # options - a Hash of options from the Info command
+    # options - a Hash of options from the `list` command
     #
     #   Note: if options are empty, this will display a
-    #   list of plugin names, versions, and descriptions,
+    #   list of plugin names, slugs, versions, and descriptions,
     #   but no assets, i.e. 'minimal' info.
     #
     #
-    def self.info(options={})
+    def self.list(options={})
       Plugins.register site(options)
       options = {'minimal'=>true} if options.empty?
       message = "Octopress Ink - v#{VERSION}\n"
@@ -97,9 +109,9 @@ module Octopress
       end
     end
 
-    def self.copy_plugin_assets(name, path, options)
+    def self.copy_plugin_assets(name, options)
       Plugins.register site(options)
-      if path
+      if path = options.delete('path')
         full_path = File.join(Plugins.site.source, path)
         if !Dir["#{full_path}/*"].empty? && options['force'].nil?
           abort "Error: directory #{path} is not empty. Use --force to overwrite files."

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

@@ -27,7 +27,7 @@ module Octopress
         end
 
         def url_info
-          "path: #{page.url.sub(/^\//,'')}"
+          "/#{page.url.sub(/^\//,'')}"
         end
 
         def user_dir

data/lib/octopress-ink/commands.rb

@@ -3,6 +3,7 @@ module Octopress
     module Commands
       require 'octopress-ink/commands/list'
       require 'octopress-ink/commands/copy'
+      require 'octopress-ink/commands/new'
 
       class Ink < Octopress::Command
 
@@ -18,6 +19,7 @@ module Octopress
 
             List.process_command(c)
             Copy.process_command(c)
+            New.process_command(c)
           end
         end
       end

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

@@ -4,20 +4,20 @@ module Octopress
       class Copy
         def self.process_command(p)
           p.command(:copy) do |c|
-            c.syntax "copy <PLUGIN> [PATH] [options]"
-            c.description "Copy plugin assets to PATH (PATH defaults to _plugins/[plugin_name]/)"
-            c.option "all", "--all", "Copy all plugin assets"
-            c.option "force", "--force", "Overwrite files"
+            c.syntax "copy <PLUGIN> [options]"
+            c.description "Copy plugin assets to _plugins/PLUGIN/."
+            c.option "all", "--all", "Copy all plugin assets."
+            c.option "force", "--force", "Overwrite files."
+            c.option "path", "--path PATH", "Copy plugin assets to an alternate path."
             CommandHelpers.add_asset_options(c, 'Copy')
 
             c.action do |args, options|
               if args.empty?
-                puts "Error: Please pass a plugin to install assets from."
+                puts "Error: Please pass a plugin slug to install assets from that plugin."
                 Octopress::Ink.list_plugins
               else
                 name = args[0]
-                path = args[1]
-                Octopress::Ink.copy_plugin_assets(name, path, options)
+                Octopress::Ink.copy_plugin_assets(name, options)
               end
             end
           end

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

@@ -5,14 +5,14 @@ module Octopress
         def self.process_command(p)
           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"
+            c.description "Get a list of installed octopress ink plugins for this site."
+            c.option "all", "--all", "List all plugins and their assets."
             CommandHelpers.add_asset_options(c, 'List')
-            c.option "docs", "--docs", "List only documentation pages"
+            c.option "docs", "--docs", "List only documentation pages."
 
             c.action do |args, options|
               if args.empty?
-                Octopress::Ink.info(options)
+                Octopress::Ink.list(options)
               else
                 name = args.first
                 Octopress::Ink.plugin_info(name, options)

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

@@ -0,0 +1,160 @@
+module Octopress
+  module Ink
+    module Commands
+      class New
+        def self.process_command(p)
+          p.command(:new) do |c|
+            c.syntax "new <PLUGIN_NAME> [options]"
+            c.description "Create a new Octopress Ink plugin with Ruby gem scaffolding."
+            c.option "path", "--path PATH", "Create a plugin at a specified path (defaults to current directory)."
+            c.option "theme", "--theme", "Create a new theme."
+
+            c.action do |args, options|
+              if args.empty?
+                raise "Please provide a plugin name, e.g. my_awesome_plugin."
+              else
+                options['name'] = args[0]
+                @options = options
+                new_plugin
+              end
+            end
+          end
+        end
+
+        def self.new_plugin
+          path = @options['path'] ||= Dir.pwd
+          gem_name = @options['name']
+
+          @gem_dir = File.join(path, gem_name)
+          @gemspec_file = "#{gem_name}/#{gem_name}.gemspec"
+
+          if !Dir.exist?(path)
+            raise "Directory not found: #{File.expand_path(path)}."
+          end
+
+          if !Dir["#{@gem_dir}/*"].empty?
+            raise "Directory not empty: #{File.expand_path(@gem_dir)}."
+          end
+
+          FileUtils.cd path do
+            create_gem
+            add_dependency
+            add_plugin
+            add_asset_dirs
+            add_demo_files
+          end
+        end
+
+        def self.create_gem
+          begin
+            require 'bundler/cli'
+            bundler = Bundler::CLI.new
+          rescue LoadError
+            raise "To use this feautre you'll need to install the bundler gem with `gem install bundler`."
+          end
+
+          bundler.gem(@options['name'])
+        end
+
+        # Add Octopress Ink dependency to Gemspec
+        #
+        def self.add_dependency
+          minor_version = VERSION.scan(/\d\.\d/)[0]
+          @gemspec = File.open(@gemspec_file).read
+          dependency  = "  spec.add_runtime_dependency 'octopress-ink', '~> #{minor_version}', '>= #{VERSION}'\n"
+          dependency += "\n  spec.add_development_dependency 'octopress'\n"
+
+          pos = @gemspec.index("  spec.add_development_dependency")
+          @gemspec = insert_before(@gemspec, pos, dependency)
+
+          File.open(@gemspec_file, 'w+') {|f| f.write(@gemspec) }
+        end
+
+        # Add Octopress Ink plugin to core module file
+        #
+        def self.add_plugin
+          # Grab the module directory from the version.rb require.
+          # If a gem is created with dashes e.g. "some-gem", Bundler puts the module file at lib/some/gem.rb
+          module_subpath = @gemspec.scan(/['"](.+)\/version['"]/).flatten[0]
+          @module_file = File.join(@options['name'], 'lib', "#{module_subpath}.rb")
+          mod = File.open(@module_file).read
+          
+          # Find the inner most module name
+          @modules  = mod.scan(/module\s+(.+?)\n/).flatten
+          @mod_path = @modules.join('::')
+          
+          mod = add_simple_plugin mod
+
+          File.open(@module_file, 'w+') {|f| f.write(mod) }
+        end
+
+        def self.add_asset_dirs
+          %w{images fonts pages files layouts includes stylesheets javascripts}.each do |asset|
+            dir = File.join(@options['name'], 'assets', asset)
+            FileUtils.mkdir_p dir
+          end
+        end
+
+        # New plugin uses a simple configuration hash
+        #
+        def self.add_simple_plugin(mod)
+          mod  = mod.scan(/require.+\n/)[0]
+          mod += 'require "octopress-ink"'
+          mod += "\n\nOctopress::Ink.new_plugin({\n#{indent(plugin_config)}\n})"
+        end
+
+        def self.plugin_config
+          plugin_name = format_name(@modules.last)
+          plugin_slug = Filters.sluggify(@options['name'])
+          depth = @module_file.count('/') - 1
+          assets_path = ("../" * depth) + 'assets'
+          type = @options['theme'] ? 'theme' : 'plugin'
+
+          config = <<-HERE
+name:          "#{plugin_name}",
+slug:          "#{plugin_slug}",
+assets_path:   File.expand_path(File.join(File.dirname(__FILE__), "#{assets_path}")),
+type:          "#{type}",
+version:       #{@mod_path}::VERSION,
+description:   "",
+website:       ""
+          HERE
+          config.rstrip
+        end
+
+        def self.add_demo_files
+          dir = File.join(@options['name'], 'demo')
+          Jekyll::Commands::New.process([dir], {blank: true})
+
+          gemfile = <<-HERE
+source 'https://rubygems.org'
+
+group :octopress do
+  gem 'octopress'
+  gem '#{@options['name']}', path: '../'
+end
+          HERE
+
+          File.open(File.join(dir, 'Gemfile'), 'w+') {|f| f.write(gemfile) }
+        end
+
+        def self.indent(input, level=1)
+          input.gsub(/^/, '  ' * level)
+        end
+        # Add spaces between capital letters
+        #
+        def self.format_name(name)
+          name.scan(/.*?[a-z](?=[A-Z]|$)/).join(' ')
+        end
+
+        def self.insert_before(str, pos, input)
+          if pos
+            str[0..(pos - 1)] + input + str[pos..-1]
+          else
+            str
+          end
+        end
+      end
+    end
+  end
+end

data/lib/octopress-ink/jekyll/page.rb

@@ -28,10 +28,10 @@ module Octopress
           @url
         else
           begin
-            if path_config = self.data['url_config']
-              config = @config
-              path_config.split('.').each { |key| config = config[key] }
-              @url = config if config.is_a? String
+            config = @config['page_permalinks'][File.basename(self.name, '.*')]
+            if config.is_a? String
+              @url = config
+              self.data['permalink'] = nil
             end
           rescue; end
 

data/lib/octopress-ink/plugin.rb

@@ -12,8 +12,8 @@ module Octopress
                     :layouts_dir, :stylesheets_dir, :javascripts_dir, :files_dir, :includes_dir, :images_dir,
                     :layouts, :includes, :images, :fonts, :files, :pages, :docs
 
-      def initialize
-        DEFAULT_CONFIG.merge(configuration).each { |k,v| set_config(k,v) }
+      def initialize(options={})
+        DEFAULT_CONFIG.merge(options || configuration).each { |k,v| set_config(k,v) }
 
         @layouts_dir       = 'layouts'
         @files_dir         = 'files'
@@ -156,35 +156,47 @@ module Octopress
 
       def info(options={})
         if options['minimal']
-          message = " #{@name}"
-          message += " (theme)" if @type == 'theme'
-          message += " - v#{@version}" if @version
-          if @description
-            message = "#{message.ljust(30)} #{@description}"
-          end
-          message += "\n"
+          minimal_info
         else
-          asset_info = assets_info(options)
-          return '' if asset_info.empty?
-
-          name = "Plugin: #{@name}"
-          name += " (theme)" if @type == 'theme'
-          name += " - v#{@version}" if @version
-          name  = name
-          message = name
-          message += "\nSlug: #{slug}"
-
-          if @description
-            message += "\n#{@description}"
-          end
+          detailed_info(options)
+        end
+      end
+
+      def minimal_info
+        message = " #{@name}"
+        message += " (#{slug})"
+        message += " - v#{@version}" if @version
+        if @description && !@description.empty?
+          message = "#{message.ljust(30)} - #{@description}"
+        end
+        message += "\n"
+      end
 
-          lines = ''
-          80.times { lines += '=' }
+      def detailed_info(options)
+        asset_info = assets_info(options)
+        return '' if asset_info.empty?
 
-          message = "\n#{message}\n#{lines}\n"
-          message += asset_info
-          message += "\n"
+        name = "Plugin: #{@name}"
+        name += " (theme)" if @type == 'theme'
+        name += " - v#{@version}" if @version
+        name  = name
+        message = name
+        message += "\nSlug: #{slug}"
+
+        if @description && !@description.empty?
+          message += "\n#{@description}"
         end
+
+        if @website && !@website.empty?
+          message += "\n#{@website}"
+        end
+
+        lines = ''
+        80.times { lines += '=' }
+
+        message = "\n#{message}\n#{lines}\n"
+        message += asset_info
+        message += "\n"
       end
 
       def pad_line(line)

data/lib/octopress-ink/plugins.rb

@@ -59,8 +59,8 @@ module Octopress
         @site
       end
 
-      def self.register_plugin(plugin)
-        new_plugin = plugin.new
+      def self.register_plugin(plugin, options=nil)
+        new_plugin = plugin.new(options)
 
         case new_plugin.type
         when 'theme'

data/lib/octopress-ink/version.rb

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

data/test/copy_layouts_pages/_copy/pages/four.xml

@@ -0,0 +1,5 @@
+---
+permalink: /four/
+---
+
+This page is totally a thing.

data/test/copy_layouts_pages/_copy/pages/one.xml

@@ -1,4 +1,4 @@
 ---
-url_config: feed.url
+permalink: /test_pages/feed/
 ---
 <tag>fooo</tag>

data/test/copy_layouts_pages/_copy/pages/three.md

@@ -1,5 +1,6 @@
 ---
 layout: default
+permalink: /test_pages/three.html
 ---
 
 SUB BABY

data/test/copy_layouts_pages/_copy/pages/two.md

@@ -1,6 +1,6 @@
 ---
 layout: theme:default
-url_config: page_urls.test
+permalink_config: page_two
 ---
 
 Testing pages. **strong** *emphasized* [a link](http://example.com)

data/test/copy_test/_copy/pages/four.xml

@@ -0,0 +1,5 @@
+---
+permalink: /four/
+---
+
+This page is totally a thing.

data/test/copy_test/_copy/pages/one.xml

@@ -1,4 +1,4 @@
 ---
-url_config: feed.url
+permalink: /test_pages/feed/
 ---
 <tag>fooo</tag>

data/test/copy_test/_copy/pages/three.md

@@ -1,5 +1,6 @@
 ---
 layout: default
+permalink: /test_pages/three.html
 ---
 
 SUB BABY

data/test/copy_test/_copy/pages/two.md

@@ -1,6 +1,6 @@
 ---
 layout: theme:default
-url_config: page_urls.test
+permalink: /test_pages/theme_page.html
 ---
 
 Testing pages. **strong** *emphasized* [a link](http://example.com)

data/test/expected/four/index.xml

@@ -0,0 +1 @@
+This page is totally a thing.

data/test/plugins/awesome-sauce/pages/{test_pages/one.html → a.html}

@@ -1,4 +1,4 @@
 ---
-url_config: page_urls.one
+permalink: /cats.html
 ---
 Page one from plugin

data/test/plugins/awesome-sauce/pages/b.html

@@ -0,0 +1,4 @@
+---
+permalink: /test_pages/plugin_page.html
+---
+Page two from plugin

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

@@ -1,15 +1,8 @@
 require 'octopress-ink'
 
-class TestPlugin < Octopress::Ink::Plugin
-  def configuration
-    {
-      name:        'Awesome Sauce',
-      slug:        'awesome-sauce',
-      assets_path: File.expand_path(File.dirname(__FILE__)),
-      description: "Test some plugins y'all"
-    }
-  end
-end
-
-Octopress::Ink.register_plugin(TestPlugin)
-
+Octopress::Ink.new_plugin({
+  name:        'Awesome Sauce',
+  slug:        'awesome-sauce',
+  assets_path: File.expand_path(File.dirname(__FILE__)),
+  description: "Test some plugins y'all"
+})

data/test/plugins/test-theme/config.yml

@@ -1,5 +1,2 @@
 test: config from theme
 test_override: also config from theme
-page_urls:
-  sub: /test-pages/sub/test.html
-  test: /test-pages/index.html

data/test/plugins/test-theme/pages/four.xml

@@ -0,0 +1,5 @@
+---
+permalink: /four/
+---
+
+This page is totally a thing.

data/test/plugins/test-theme/pages/one.xml

@@ -0,0 +1,4 @@
+---
+permalink: /test_pages/feed/
+---
+<tag>fooo</tag>

data/test/plugins/test-theme/pages/{test_pages/three.md → three.md}

@@ -1,5 +1,6 @@
 ---
 layout: default
+permalink: /test_pages/three.html
 ---
 
 SUB BABY

data/test/plugins/test-theme/pages/{test_pages/two.md → two.md}

@@ -1,6 +1,5 @@
 ---
 layout: theme:default
-url_config: page_urls.test
 ---
 
 Testing pages. **strong** *emphasized* [a link](http://example.com)

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

@@ -1,14 +1,8 @@
 require 'octopress-ink'
 
-class TestTheme < Octopress::Ink::Plugin
-  def configuration
-    {
-      type:        "theme",
-      description: "Test theme y'all",
-      name:        "Classic Theme",
-      assets_path:  File.expand_path(File.dirname(__FILE__))
-    }
-  end
-end
-
-Octopress::Ink.register_plugin(TestTheme)
+Octopress::Ink.new_plugin({
+  name:        "Classic Theme",
+  type:        "theme",
+  description: "Test theme y'all",
+  assets_path:  File.expand_path(File.dirname(__FILE__))
+})

data/test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css

@@ -1,4 +1,4 @@
-/* Theme: classic */
+/* Theme: Classic Theme */
 body { margin: 2px; padding: 2px; }
 
 .main { color: #444; }
@@ -8,7 +8,7 @@ body { background: black; }
 /* Plugin: awesome-sauce */
 .plugin-widget { background: red; color: #fff; }
 
-/* Plugin: asset-pipeline */
+/* Plugin: Octopress Asset Pipeline */
 .css-plugin { background: #fed; }
 
 body { display: table; }

data/test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css

@@ -1,3 +1,5 @@
+/* Theme: Classic Theme */
 * { background: none; color: #000; }
 
+/* Plugin: Awesome Sauce */
 article a:after { content: attr(href); }

data/test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css

@@ -1,4 +1,4 @@
-/* Theme: classic */
+/* Theme: Classic Theme */
 body {
   margin: 2px;
   padding: 2px;
@@ -18,7 +18,7 @@ body {
   color: #fff;
 }
 
-/* Plugin: asset-pipeline */
+/* Plugin: Octopress Asset Pipeline */
 .css-plugin {
   background: #fed;
 }

data/test/sass_expanded/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css

@@ -1,8 +1,10 @@
+/* Theme: Classic Theme */
 * {
   background: none;
   color: #000;
 }
 
+/* Plugin: Awesome Sauce */
 article a:after {
   content: attr(href);
 }

data/test/source/_plugins/awesome-sauce/config.yml

@@ -1,8 +1,4 @@
 test_override: config from plugin override
-page_urls:
-  one: test_pages/plugin_page_override.html
-  two: test_pages/plugin_page.html
-
-#disable:
-  #pages: test_pages/one.html
-  #includes: true
+page_permalinks:
+  a: test_pages/plugin_page_override.html
+  b: test_pages/plugin_page.html

data/test/source/_plugins/theme/config.yml

@@ -1,8 +1,7 @@
 test_override: config from theme override
-page_urls:
-  test: test_pages/theme_page.html
-feed:
-  url: test_pages/feed/
+page_permalinks:
+  two: test_pages/theme_page.html
+  feed: test_pages/feed/
 
 disable:
   fonts: true

data/test/test.rb

@@ -166,22 +166,22 @@ test_javascripts('concat_js')
 test_configs('expected')
 test_root_assets('expected')
 
-Octopress::Ink.copy_plugin_assets('theme', '_copy', {'force'=> true})
+Octopress::Ink.copy_plugin_assets('theme', {'path' => '_copy', 'force'=> true})
 test_copy_assets('copy_test')
 
-Octopress::Ink.copy_plugin_assets('theme', '_copy', {'force'=> true, 'layouts' => true, 'pages' => true})
+Octopress::Ink.copy_plugin_assets('theme', {'path' => '_copy', 'force'=> true, 'layouts' => true, 'pages' => true})
 test_copy_assets('copy_layouts_pages')
 
 build octopress_config: '_concat_false.yml'
 test_stylesheets('concat_css_false', false)
 test_javascripts('concat_js_false', false)
-#test_disabled('site')
+test_disabled('site')
 
-#build config: '_sass_compact.yml'
-#test_stylesheets('sass_compact')
+build config: '_sass_compact.yml'
+test_stylesheets('sass_compact')
 
-#build config: '_sass_expanded.yml'
-#test_stylesheets('sass_expanded')
+build config: '_sass_expanded.yml'
+test_stylesheets('sass_expanded')
 
 print_failures
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.43
+  version: 1.0.0.alpha.44
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -116,7 +116,6 @@ files:
 - Rakefile
 - assets/docs/_configuration.markdown
 - assets/docs/_plugin-template.markdown
-- assets/docs/creating-a-gem.markdown
 - assets/docs/creating-a-plugin.markdown
 - assets/docs/index.markdown
 - assets/docs/plugin-reference.markdown
@@ -139,6 +138,7 @@ files:
 - lib/octopress-ink/commands/copy.rb
 - lib/octopress-ink/commands/helpers.rb
 - lib/octopress-ink/commands/list.rb
+- lib/octopress-ink/commands/new.rb
 - lib/octopress-ink/configuration.rb
 - lib/octopress-ink/filters.rb
 - lib/octopress-ink/generators/plugin_assets.rb
@@ -194,6 +194,7 @@ files:
 - test/copy_layouts_pages/_copy/layouts/default.html
 - test/copy_layouts_pages/_copy/layouts/test.html
 - test/copy_layouts_pages/_copy/pages/disable-test.html
+- test/copy_layouts_pages/_copy/pages/four.xml
 - test/copy_layouts_pages/_copy/pages/one.xml
 - test/copy_layouts_pages/_copy/pages/three.md
 - test/copy_layouts_pages/_copy/pages/two.md
@@ -210,6 +211,7 @@ files:
 - test/copy_test/_copy/layouts/default.html
 - test/copy_test/_copy/layouts/test.html
 - test/copy_test/_copy/pages/disable-test.html
+- test/copy_test/_copy/pages/four.xml
 - test/copy_test/_copy/pages/one.xml
 - test/copy_test/_copy/pages/three.md
 - test/copy_test/_copy/pages/two.md
@@ -222,6 +224,7 @@ files:
 - test/expected/2014/02/01/test-post.html
 - test/expected/favicon.ico
 - test/expected/favicon.png
+- test/expected/four/index.xml
 - test/expected/index.html
 - test/expected/robots.txt
 - test/expected/test_config/plugin_config.html
@@ -248,8 +251,8 @@ files:
 - test/plugins/awesome-sauce/files/robots.txt
 - test/plugins/awesome-sauce/includes/some-include.html
 - test/plugins/awesome-sauce/layouts/test-layout.html
-- test/plugins/awesome-sauce/pages/test_pages/one.html
-- test/plugins/awesome-sauce/pages/test_pages/two.html
+- test/plugins/awesome-sauce/pages/a.html
+- test/plugins/awesome-sauce/pages/b.html
 - test/plugins/awesome-sauce/plugin.rb
 - test/plugins/awesome-sauce/stylesheets/plugin-media-test@print.css
 - test/plugins/awesome-sauce/stylesheets/plugin-test.css
@@ -268,10 +271,10 @@ files:
 - test/plugins/test-theme/layouts/default.html
 - test/plugins/test-theme/layouts/test.html
 - test/plugins/test-theme/pages/disable-test.html
-- test/plugins/test-theme/pages/test_pages/disable-test.html
-- test/plugins/test-theme/pages/test_pages/one.xml
-- test/plugins/test-theme/pages/test_pages/three.md
-- test/plugins/test-theme/pages/test_pages/two.md
+- test/plugins/test-theme/pages/four.xml
+- test/plugins/test-theme/pages/one.xml
+- test/plugins/test-theme/pages/three.md
+- test/plugins/test-theme/pages/two.md
 - test/plugins/test-theme/plugin.rb
 - test/plugins/test-theme/stylesheets/_colors.scss
 - test/plugins/test-theme/stylesheets/disable-this.css
@@ -371,6 +374,7 @@ test_files:
 - test/copy_layouts_pages/_copy/layouts/default.html
 - test/copy_layouts_pages/_copy/layouts/test.html
 - test/copy_layouts_pages/_copy/pages/disable-test.html
+- test/copy_layouts_pages/_copy/pages/four.xml
 - test/copy_layouts_pages/_copy/pages/one.xml
 - test/copy_layouts_pages/_copy/pages/three.md
 - test/copy_layouts_pages/_copy/pages/two.md
@@ -387,6 +391,7 @@ test_files:
 - test/copy_test/_copy/layouts/default.html
 - test/copy_test/_copy/layouts/test.html
 - test/copy_test/_copy/pages/disable-test.html
+- test/copy_test/_copy/pages/four.xml
 - test/copy_test/_copy/pages/one.xml
 - test/copy_test/_copy/pages/three.md
 - test/copy_test/_copy/pages/two.md
@@ -399,6 +404,7 @@ test_files:
 - test/expected/2014/02/01/test-post.html
 - test/expected/favicon.ico
 - test/expected/favicon.png
+- test/expected/four/index.xml
 - test/expected/index.html
 - test/expected/robots.txt
 - test/expected/test_config/plugin_config.html
@@ -425,8 +431,8 @@ test_files:
 - test/plugins/awesome-sauce/files/robots.txt
 - test/plugins/awesome-sauce/includes/some-include.html
 - test/plugins/awesome-sauce/layouts/test-layout.html
-- test/plugins/awesome-sauce/pages/test_pages/one.html
-- test/plugins/awesome-sauce/pages/test_pages/two.html
+- test/plugins/awesome-sauce/pages/a.html
+- test/plugins/awesome-sauce/pages/b.html
 - test/plugins/awesome-sauce/plugin.rb
 - test/plugins/awesome-sauce/stylesheets/plugin-media-test@print.css
 - test/plugins/awesome-sauce/stylesheets/plugin-test.css
@@ -445,10 +451,10 @@ test_files:
 - test/plugins/test-theme/layouts/default.html
 - test/plugins/test-theme/layouts/test.html
 - test/plugins/test-theme/pages/disable-test.html
-- test/plugins/test-theme/pages/test_pages/disable-test.html
-- test/plugins/test-theme/pages/test_pages/one.xml
-- test/plugins/test-theme/pages/test_pages/three.md
-- test/plugins/test-theme/pages/test_pages/two.md
+- test/plugins/test-theme/pages/four.xml
+- test/plugins/test-theme/pages/one.xml
+- test/plugins/test-theme/pages/three.md
+- test/plugins/test-theme/pages/two.md
 - test/plugins/test-theme/plugin.rb
 - test/plugins/test-theme/stylesheets/_colors.scss
 - test/plugins/test-theme/stylesheets/disable-this.css

data/assets/docs/creating-a-gem.markdown

@@ -1,69 +0,0 @@
----
-title: "Creating a Gem"
-permalink: /guides/creating-a-gem/
----
-
-*This guide assumes you have already installed Git, and Ruby 1.9.3 or greater.*
-
-Octopress Ink plugins are distributed as ruby gems so you'll probably need to create an acconut at [RubyGems.org](https://rubygems.org/sign_up) if you haven't yet. Also, be sure you have [bundler](http://bundler.io) installed.
-
-### How to Create a Gem
-
-The [bundler gem](http://bundler.io/) is a great way to manage gems and provides some terrific utilites for gem creators. Go ahead and
-install it if you haven't yet.
-
-```sh
-gem install bundler
-```
-
-Now we'll use Bundler to create a gem project for our new plugin.
-
-```sh
-bundle gem baconnaise
-```
-
-That's right, this plugin will be called `baconnaise`. That command will generate a bunch of files into the new `baconnaise` directory. Take a peek inside and you'll see somethig like this:
-
-```
-lib/
-  baconnaise/
-    version.rb
-  baconnaise.rb
-baconnaise.gemspec
-Gemfile
-LICENSE.txt
-Rakefile
-README.md
-```
-
-First, you'll want to edit your `baconnaise.gemspec` to be sure the information in that is right. Be sure to change the default description and summary. The gem won't build if you have a *TODO* in either of those. Here's what we're gonig to go with.
-
-```ruby
-spec.description   = %q{Baconnaise, because mistakes have never been this spreadable.}
-spec.summary       = %q{Baconnaise, because #YOLO.}
-```
-
-Next you'll want to add Octopress Ink as a runtime dependency. Here's what that looks like.
-
-```ruby
-spec.add_runtime_dependency 'octopress-ink', '~> 1.0'
-```
-
-#### A note on Version Numbering
-
-By default the `bundle gem` command starts you off at version `0.0.1`. If you take a look at `lib/baconnaise/version.rb` you'll see this.
-
-```
-module Baconnaise
-  VERSION = "0.0.1"
-end
-```
-
-I'd encourage you to change your version number to `1.0.0` as soon as you release your plugin for production use. For a sensible guide on version numbers, refer to [semver.org](http://semver.org/).
-
----
-
-For the next part we'll take a look at creating an Octopress Ink plugin.
-
-[Creating a Plugin →]({% doc_url /guides/creating-a-plugin/ %})
-

data/test/plugins/awesome-sauce/pages/test_pages/two.html

@@ -1,4 +0,0 @@
----
-url_config: page_urls.two
----
-Page two from plugin

data/test/plugins/test-theme/pages/test_pages/disable-test.html

@@ -1,3 +0,0 @@
----
----
-This page shouldn't appear

data/test/plugins/test-theme/pages/test_pages/one.xml

@@ -1,4 +0,0 @@
----
-url_config: feed.url
----
-<tag>fooo</tag>