octopress-ink 1.0.0.rc.3 → 1.0.0.rc.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e476ab7bb87cbaf0d374bf52ed469ebc89036015
-  data.tar.gz: 9d38606191260e669ad620d8ce594e56403495e8
+  metadata.gz: 929a480cd5c29286e1e9d27ac281ce9f78352205
+  data.tar.gz: d946b8c7b9154c3b1c8c264ff0fadda79bcfaaf7
 SHA512:
-  metadata.gz: 664d0f6419d7c8941483904059e051b72d7e9bda48c0c85cea78e904354cc8599f0f46b3f4ca99d8027a82fc0f073b5bd334bd2a435437213af28155e8418a2d
-  data.tar.gz: a67dc2f4c8e144b7767ca634ebf02e94ae410a4b32ae9947e0adf62ed890aa6d93e2245d2b4231b8149881a50d248802397d9e3c92892f7539d7c491ac147113
+  metadata.gz: 412911ec07bbcd3deb32b4927d02e099e5720d3e87a2b540fa19e1fb35fb8790232d1dcee09c8c8c3b9d0fa38a38dff7b643a81abe91ada2dc53b2459bc22e16
+  data.tar.gz: 266037047141b44054ce6cb560920ce4283b41d553bc56fb8f1678ead45efa140f5becf4264f6e85be5a44eef7af4af75db91a715b0d13c1d10e1dee01c01c63

data/CHANGELOG.md

@@ -2,12 +2,21 @@
 
 ## Current released version
 
-### 1.0.0 RC3 - 2014-05-27
+### 1.0.0 RC5 - 2014-06-06
 
-- Improved: Now copy and list commands use the flag --config-file instead of --defaults
+- New: site.linkposts loops through linkposts
+- New: site.articles loops through non-linkpost articles
 
 ## Past versions
 
+### 1.0.0 RC4 - 2014-05-28
+
+- Improved: Plugin scaffold does a better job of handling gem names with dashes.
+
+### 1.0.0 RC3 - 2014-05-27
+
+- Improved: Now copy and list commands use the flag --config-file instead of --defaults
+
 ### 1.0.0 RC2 - 2014-05-26
 
 - Fixed: Post and Page data is appended to at read time.

data/lib/octopress-ink.rb

@@ -68,6 +68,11 @@ module Octopress
     end
 
     def self.site=(site)
+      # Octopress historically used site.title
+      # This allows theme developers to expect site.name
+      # in consistancy with Jekyll's scaffold config 
+      site.config['name'] ||= site.config['title']
+
       @site = site
     end
 
@@ -81,6 +86,14 @@ module Octopress
         payload['doc_pages'] = Octopress::Ink::Plugins.doc_pages
       end
 
+      payload['site']['linkposts'] = site.posts.collect do |p|
+        p.data['linkpost']
+      end
+
+      payload['site']['articles'] = site.posts.reject do |p|
+        p.data['linkpost']
+      end
+
       payload
     end
 

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

@@ -90,6 +90,10 @@ module Octopress
           end
         end
 
+        def destination
+          File.join(dir, file)
+        end
+
         private
 
         def source_dir
@@ -100,10 +104,6 @@ module Octopress
           end
         end
 
-        def destination
-          File.join(dir, file)
-        end
-
         # Render file through Liquid if it contains YAML front-matter
         #
         def render

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

@@ -26,6 +26,15 @@ module Octopress
           end
         end
 
+        def page
+          @page ||= Page.new(Ink.site, source_dir, page_dir, file, plugin.config)
+        end
+
+        def info
+          message = super
+          message.ljust(25) + url_info
+        end
+
         private
 
         def page_dir
@@ -44,9 +53,6 @@ module Octopress
           File.join Ink.site.source, Plugins.custom_dir, plugin.slug, base
         end
 
-        def page
-          @page ||= Page.new(Ink.site, source_dir, page_dir, file, plugin.config)
-        end
       end
     end
   end

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

@@ -35,7 +35,10 @@ module Octopress
           end
 
           FileUtils.cd path do
-            create_gem(gem_name)
+            name = gem_name.gsub(/-/,'_')
+            create_gem(name)
+
+            fix_name(path) if name != gem_name
 
             @settings = gem_settings(path_to_gem)
             @settings[:type] = @options['theme'] ? 'theme' : 'plugin'
@@ -47,6 +50,40 @@ module Octopress
           end
         end
 
+        def self.fix_name(path)
+          name = @options['name'].gsub(/-/,'_')
+          path = rename(path, name)
+
+          rename(path, "lib/#{name}")
+
+          gemspec = rename(path, "#{name}.gemspec")
+          gem_file = rename(path, "lib/#{name}.rb")
+
+          rewrite_name(gemspec, name)
+          rewrite_name(gem_file, name)
+          rewrite_name(File.join(path, 'README.md'), name)
+          rewrite_name(File.join(path, 'Gemfile'), name)
+
+          action = "rename".rjust(12).green.bold
+          puts "#{action}  #{name} to #{@options['name']}"
+        end
+
+        def self.rewrite_name(path, name)
+          new_name = name.gsub(/_/, '-')
+          content = File.read(path).gsub(name, new_name)
+
+          File.open(path, 'w+') do |f|
+            f.write(content)
+          end
+        end
+
+        def self.rename(path, target)
+          old = File.join(path, target)
+          new = File.join(path, target.gsub(/_/, '-'))
+          FileUtils.mv(old, new)
+          new
+        end
+
         # Create a new gem with Bundle's gem command
         #
         def self.create_gem(name)
@@ -122,7 +159,7 @@ module Octopress
 
           config = <<-HERE
 name:          "#{@settings[:module_name]}",
-slug:          "#{@settings[:name]}",
+slug:          "#{@settings[:type] == 'theme' ? 'theme' : @settings[:name]}",
 assets_path:   File.expand_path(File.join(File.dirname(__FILE__), "#{assets_path}")),
 type:          "#{@settings[:type]}",
 version:       #{@settings[:version]},
@@ -146,7 +183,7 @@ website:       ""
           index = File.join(demo_dir, 'index.html')
           action = File.exist?(index) ? "exists".rjust(12).blue.bold : "create".rjust(12).green.bold
           FileUtils.touch index
-          puts "#{action}  #{index}"
+          puts "#{action}  #{index.sub("#{Dir.pwd}/", '')}"
 
           gemfile_path = File.join(demo_dir, 'Gemfile')
           gemfile_content = <<-HERE
@@ -172,7 +209,7 @@ end
           File.open(path, 'w+') do |f| 
             f.write(contents)
           end
-          puts "#{action}  #{path}"
+          puts "#{action}  #{path.sub("#{Dir.pwd}/", '')}"
         end
 
         def self.create_empty_dirs(dirs)
@@ -180,7 +217,7 @@ end
             dir = File.join(d)
             action = Dir.exist?(dir) ? "exists".rjust(12).blue.bold : "create".rjust(12).green.bold
             FileUtils.mkdir_p dir
-            puts "#{action}  #{dir}/"
+            puts "#{action}  #{dir.sub("#{Dir.pwd}/", '')}/"
           end
         end
 

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

@@ -2,7 +2,7 @@ module Octopress
   module Ink
     class Page < Jekyll::Page
 
-      # Override the destination for a page
+      # Purpose: Configs can override a page's permalink
       #
       # url - Path relative to destination directory.
       #       examples: 
@@ -15,10 +15,13 @@ module Octopress
       end
 
       def destination(dest)
-        if @config['path']
-          dest = File.join(dest, @config['path'])
+        unless @dest
+          if @config['path']
+            dest = File.join(dest, @config['path'])
+          end
+          @dest = File.join(dest, self.url)
         end
-        File.join(dest, self.url)
+        @dest
       end
 
       # Allow pages to read url from plugin configuration
@@ -28,7 +31,10 @@ module Octopress
           @url
         else
           begin
-            config = @config['permalinks'][File.basename(self.name, '.*')]
+
+            page_name = File.basename(self.name, '.*')
+            config = @config['permalinks'][page_name]
+
             if config.is_a? String
               @url = config
               self.data['permalink'] = nil

data/lib/octopress-ink/plugin.rb

@@ -230,6 +230,9 @@ module Octopress
           next if assets.compact.size == 0
 
           case name
+          when 'pages'
+            header = "pages:".ljust(36) + "urls"
+            message += asset_list(assets, header)
           when 'docs'
             header = "documentation: /#{docs_base_path}/"
             message += asset_list(assets, header)

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.3"
+    VERSION = "1.0.0.rc.5"
   end
 end

data/test/test-plugin-expected/.gitignore

@@ -0,0 +1,22 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/test/test-plugin-expected/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in test-plugin.gemspec
+gemspec

data/test/test-plugin-expected/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 TODO: Write your name
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/test/test-plugin-expected/README.md

@@ -0,0 +1,29 @@
+# TestPlugin
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'test-plugin'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install test-plugin
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/test-plugin/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/test/test-plugin-expected/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+

data/test/test-plugin-expected/assets/config.yml

@@ -0,0 +1,4 @@
+exclude:
+  - Gemfile*
+gems:
+  - test-plugin

data/test/test-plugin-expected/demo/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+group :octopress do
+  gem 'octopress'
+  gem 'test-plugin', path: '../'
+end

data/test/test-plugin-expected/demo/_config.yml

@@ -0,0 +1,2 @@
+exclude:
+  - Gemfile*

data/test/test-plugin-expected/lib/test-plugin.rb

@@ -0,0 +1,12 @@
+require 'test-plugin/version'
+require 'octopress-ink'
+
+Octopress::Ink.add_plugin({
+  name:          "Test Plugin",
+  slug:          "test-plugin",
+  assets_path:   File.expand_path(File.join(File.dirname(__FILE__), "../assets")),
+  type:          "plugin",
+  version:       TestPlugin::VERSION,
+  description:   "",
+  website:       ""
+})

data/test/test-plugin-expected/lib/test-plugin/version.rb

@@ -0,0 +1,3 @@
+module TestPlugin
+  VERSION = "0.0.1"
+end

data/test/test-plugin-expected/test-plugin.gemspec

@@ -0,0 +1,26 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'test-plugin/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "test-plugin"
+  spec.version       = TestPlugin::VERSION
+  spec.authors       = ["TODO: Write your name"]
+  spec.email         = ["TODO: Write your email address"]
+  spec.summary       = %q{TODO: Write a short summary. Required.}
+  spec.description   = %q{TODO: Write a longer description. Optional.}
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "octopress"
+  
+  spec.add_runtime_dependency "octopress-ink", "~> 1.0", ">= 1.0.0.rc.4"
+end

data/test/test-theme-expected/.gitignore

@@ -0,0 +1,22 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/test/test-theme-expected/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in test-theme.gemspec
+gemspec

data/test/test-theme-expected/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 TODO: Write your name
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/test/test-theme-expected/README.md

@@ -0,0 +1,29 @@
+# TestTheme
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'test-theme'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install test-theme
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/test-theme/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/test/test-theme-expected/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+

data/test/test-theme-expected/assets/config.yml

@@ -0,0 +1,4 @@
+exclude:
+  - Gemfile*
+gems:
+  - test-theme

data/test/test-theme-expected/demo/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+group :octopress do
+  gem 'octopress'
+  gem 'test-theme', path: '../'
+end

data/test/test-theme-expected/demo/_config.yml

@@ -0,0 +1,2 @@
+exclude:
+  - Gemfile*

data/test/test-theme-expected/lib/test-theme.rb

@@ -0,0 +1,12 @@
+require 'test-theme/version'
+require 'octopress-ink'
+
+Octopress::Ink.add_plugin({
+  name:          "Test Theme",
+  slug:          "theme",
+  assets_path:   File.expand_path(File.join(File.dirname(__FILE__), "../assets")),
+  type:          "theme",
+  version:       TestTheme::VERSION,
+  description:   "",
+  website:       ""
+})

data/test/test-theme-expected/lib/test-theme/version.rb

@@ -0,0 +1,3 @@
+module TestTheme
+  VERSION = "0.0.1"
+end

data/test/test-theme-expected/test-theme.gemspec

@@ -0,0 +1,26 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'test-theme/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "test-theme"
+  spec.version       = TestTheme::VERSION
+  spec.authors       = ["TODO: Write your name"]
+  spec.email         = ["TODO: Write your email address"]
+  spec.summary       = %q{TODO: Write a short summary. Required.}
+  spec.description   = %q{TODO: Write a longer description. Optional.}
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "octopress"
+  
+  spec.add_runtime_dependency "octopress-ink", "~> 1.0", ">= 1.0.0.rc.4"
+end

data/test/test.rb

@@ -2,6 +2,8 @@ require './test_suite'
 ENV['JEKYLL_ENV'] = 'test'
 
 @failures = []
+@git_user_name = `git config user.name`.chomp
+@git_user_email = `git config user.email`.chomp
 
 build
 
@@ -69,4 +71,40 @@ test_cmd({
 test_dirs('Copy theme', 'source/_copy', 'copy_layouts_pages/_copy')
 `rm -rf source/_copy`
 
+`git config user.name ''`
+`git config user.email ''`
+
+test_cmd({
+  desc: 'New plugin',
+  cmd: [
+    'octopress ink new test-plugin',
+    'rm -rf test-plugin/.git'
+  ]
+})
+
+`git config user.name "#{@git_user_name}"`
+`git config user.email #{@git_user_email}`
+
+test_dirs('New plugin', 'test-plugin', 'test-plugin-expected')
+
+`rm -rf test-plugin`
+
+`git config user.name ''`
+`git config user.email ''`
+
+test_cmd({
+  desc: 'New Theme',
+  cmd: [
+    'octopress ink new test-theme --theme',
+    'rm -rf test-theme/.git'
+  ]
+})
+
+`git config user.name "#{@git_user_name}"`
+`git config user.email #{@git_user_email}`
+
+test_dirs('New plugin', 'test-theme', 'test-theme-expected')
+
+`rm -rf test-theme`
+
 print_results

data/test/test_suite.rb

@@ -122,7 +122,7 @@ def test_cmd(options)
     end
     if options[:expect] && options[:expect].strip == output
       pout '.'.green
-    else
+    elsif options[:expect]
       pout 'F'.red
       @failures << {
         desc: options[:desc]+"\n",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.3
+  version: 1.0.0.rc.5
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -340,6 +340,30 @@ files:
 - test/source/test_tags/render.html
 - test/source/test_tags/return.html
 - test/source/test_tags/wrap.html
+- test/test-plugin-expected/.gitignore
+- test/test-plugin-expected/Gemfile
+- test/test-plugin-expected/LICENSE.txt
+- test/test-plugin-expected/README.md
+- test/test-plugin-expected/Rakefile
+- test/test-plugin-expected/assets/config.yml
+- test/test-plugin-expected/demo/Gemfile
+- test/test-plugin-expected/demo/_config.yml
+- test/test-plugin-expected/demo/index.html
+- test/test-plugin-expected/lib/test-plugin.rb
+- test/test-plugin-expected/lib/test-plugin/version.rb
+- test/test-plugin-expected/test-plugin.gemspec
+- test/test-theme-expected/.gitignore
+- test/test-theme-expected/Gemfile
+- test/test-theme-expected/LICENSE.txt
+- test/test-theme-expected/README.md
+- test/test-theme-expected/Rakefile
+- test/test-theme-expected/assets/config.yml
+- test/test-theme-expected/demo/Gemfile
+- test/test-theme-expected/demo/_config.yml
+- test/test-theme-expected/demo/index.html
+- test/test-theme-expected/lib/test-theme.rb
+- test/test-theme-expected/lib/test-theme/version.rb
+- test/test-theme-expected/test-theme.gemspec
 - test/test.rb
 - test/test_suite.rb
 - test/uglify_js_false/javascripts/all-.js
@@ -523,6 +547,30 @@ test_files:
 - test/source/test_tags/render.html
 - test/source/test_tags/return.html
 - test/source/test_tags/wrap.html
+- test/test-plugin-expected/.gitignore
+- test/test-plugin-expected/Gemfile
+- test/test-plugin-expected/LICENSE.txt
+- test/test-plugin-expected/README.md
+- test/test-plugin-expected/Rakefile
+- test/test-plugin-expected/assets/config.yml
+- test/test-plugin-expected/demo/Gemfile
+- test/test-plugin-expected/demo/_config.yml
+- test/test-plugin-expected/demo/index.html
+- test/test-plugin-expected/lib/test-plugin.rb
+- test/test-plugin-expected/lib/test-plugin/version.rb
+- test/test-plugin-expected/test-plugin.gemspec
+- test/test-theme-expected/.gitignore
+- test/test-theme-expected/Gemfile
+- test/test-theme-expected/LICENSE.txt
+- test/test-theme-expected/README.md
+- test/test-theme-expected/Rakefile
+- test/test-theme-expected/assets/config.yml
+- test/test-theme-expected/demo/Gemfile
+- test/test-theme-expected/demo/_config.yml
+- test/test-theme-expected/demo/index.html
+- test/test-theme-expected/lib/test-theme.rb
+- test/test-theme-expected/lib/test-theme/version.rb
+- test/test-theme-expected/test-theme.gemspec
 - test/test.rb
 - test/test_suite.rb
 - test/uglify_js_false/javascripts/all-.js