octopress-ink 1.0.0.rc.59 → 1.0.0.rc.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4611f1736644528737b0ffbca715cb87d68d089e
-  data.tar.gz: d2fdf86cb9daea1637f8476c8fa73b9f9475a474
+  metadata.gz: d1b39d807c17defbef7baae3e06e18b2ef404b07
+  data.tar.gz: ee5353cb0f6a991a65443a6c2d97e43b13d1ffca
 SHA512:
-  metadata.gz: 513dc21b654d6e56bff909b52d02f029c16d4417ad546ac6a09774f5a24db93947b9a306dba1fd83832e72bb03a955fc1fc9c3f1254657d8dec45e6681877311
-  data.tar.gz: 11a727bd599fce97c1d9e02d0428cccf541f694e7e6181a0bf35ef3a915b545ad85562c5a8af22df6799e8006db73a81e9f5900e27641dbb316a24c57778c278
+  metadata.gz: e5565a6667bf7cc95a60579c3c04af79313b34ce4fc181499e7319d87811e97315b2054822284ae5080ef806d74f1ea5a1ea10e4f7496e15b3f0aaaaf61d19cc
+  data.tar.gz: 7818e810d8488cf56073839cd1a5591606b7d67a4c5c6b4513265280801aa1239572e3b17c9d768126c20520acd13cb027c5c62edfc7bb5cc1f41b540b0b2038

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC60 - 2015-04-24
+- Fix: New plugin gemspec has a proper regex for adding files.
+- Fix: Plugins created when passing --path option get proper correct names.
+
 ### 1.0.0 RC59 - 2015-03-27
 - Fix: Properly clean asset cache during Jekyll watch.
 

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

@@ -26,21 +26,21 @@ module Octopress
           gem_name = @options['name']
           path_to_gem = File.join(path, gem_name)
 
-          if !Dir.exist?(path)
+          if !File.exist?(path)
             raise "Directory not found: #{File.expand_path(path)}."
           end
 
-          if !Dir["#{path_to_gem}/*"].empty?
-            raise "Directory not empty: #{File.expand_path(path_to_gem)}."
-          end
+          Dir.chdir(path) do
+            if Dir.exist?(gem_name) && !Dir["#{gem_name}/*"].empty?
+              raise "Directory not empty: #{File.expand_path(gem_name)}."
+            end
 
-          FileUtils.cd path do
             name = gem_name.gsub(/-/,'_')
             create_gem(name)
 
-            fix_name(path) if name != gem_name
+            fix_name(gem_name) if name != gem_name
 
-            @settings = gem_settings(path_to_gem)
+            @settings = gem_settings(gem_name)
             @settings[:type] = @options['theme'] ? 'theme' : 'plugin'
 
             fix_spec_files
@@ -53,7 +53,7 @@ module Octopress
 
         def self.fix_name(path)
           name = @options['name'].gsub(/-/,'_')
-          path = rename(path, name)
+          path = rename('./', name)
 
           rename(path, "lib/#{name}")
 
@@ -87,7 +87,7 @@ module Octopress
 
         def self.fix_spec_files
           @settings[:gemspec].sub! /(#{@settings[:spec_var]}\.files\s+=\s+)(.+)$/ do
-            $1+"`git ls-files -z`.split(\"\\x0\").grep(/^(bin\/|lib\/|assets\/|changelog|readme|license)/i)"
+            $1+"`git ls-files -z`.split(\"\\x0\").grep(%r{^(bin/|lib/|assets/|changelog|readme|license)}i)"
           end.sub!(/\s*#{@settings[:spec_var]}\.test_files.+$/, '') 
         end
 

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.59
+  version: 1.0.0.rc.60
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll