knife-cookbook-doc 0.14.0 → 0.15.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWY0ZDM0NzU0Njk3M2Q0NWEwMDBlNGY2M2FkMDk2NTg5MjNkOTBjZg==
+    NmNiMDNhYTk3Y2U4MjUzZGExZGY2MGZmOGQzMDMzZTNjZjdjZGUyOQ==
   data.tar.gz: !binary |-
-    ODNiODg1ZjA4NTE3ZTI2MmQ3ZjhmZWJhOGIyNGFlOGJmMzUyMjZlYQ==
+    ODk5ZDcyMTQzNmQzMWUzYmQ0MGMxMWI1MmJlY2YyODRjNzAyMzU2Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjViNDgzN2MyMzhlNjkwMWUzMDc2NjQwZWMyZmM1NTU3YmI0MDI0NzA2NGZi
-    MmU4OTAxYWMwNWJkNmNlNWUxODBkZTRjZDkyZDljOTQ0YTA4Yzc5MTAyZjE5
-    YTEzN2VhMjA3YjBkN2ZkMjgxN2QyYTk1NzFhZDAyMGYyMTk4NDY=
+    NWU0ZWQ4YThjNzUzMDE0NzYxNjE3MTlmNjdmNDk1N2M0N2RkZjVmZmRjZWJh
+    ODQ2Yjk4NWU1NDRhYzEwNzQ0ZDg4YWU1NjU5NGUwMDMwOGJhMzZjNmMyYzI3
+    MzkzZDFlY2E5MzdlMTVkMTA4NGFlOTYyODQ3ZDY3Y2EyYjBlMmM=
   data.tar.gz: !binary |-
-    ZWUwYzMyOTZlZDdhOTg3Y2MyM2ZkOGIxZTVjOWEwOWI3NDVlZDkzMGE3OTMz
-    YmQzNDhhNzRjNTY3YzU0NzViMDU2NjAzNGNjMzQwOTQ2OTQ3YWY1NGUzYjYz
-    MDEyMjdhODdhNjI4ZTdmYWIzZDJiYzUxMzJkM2UzYmU2ZjgzNWQ=
+    ZGNjNTVjMDA5ZTFmZDQ3ODE1OWJhNjQ3MmVmMmYzZTMxMDNkZjgwZjI5ZWM0
+    M2NiMjZmODA1ZmFlOTQ4OTRmODBkZDRkNGYwMjcwZDE4ZWJjY2Q3NGFkZWUw
+    ZjlkYWFkZmIxYjdmMDMzNjRjZmRlMDQ2NmU0NjU0ODNmNjI4ODU=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.15.0 (Mar 20 2015)
+
+* Further bug-fixes for multi-line attributes. Submitted By Drew Blessing.
+* Introduce automated testing infrastructure. Submitted By Drew Blessing.
+
 # v0.14.0 (Mar 17 2015)
 
 * Further bug-fixes for multi-line attributes. Submitted By Drew Blessing.

data/knife_cookbook_doc.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'erubis'
 
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
 end

data/lib/knife_cookbook_doc/attributes_model.rb

@@ -39,10 +39,10 @@ module KnifeCookbookDoc
       end
 
       # get/parse comments
-      resource_data = resource_data.gsub(/^=begin\s*\n\s*\#\<\s*\n(.*?)\n^\s*\#\>\n=end\s*\n#{ATTRIBUTE_REGEX}/) do
+      resource_data = resource_data.gsub(/^=begin\s*\n\s*\#\<\s*\n(.*?)^\s*\#\>\n=end\s*\n#{ATTRIBUTE_REGEX}/m) do
         update_attribute($2, $1)
       end
-      resource_data = resource_data.gsub(/^\s*\#\<\n(.*?)\n^\s*\#\>\n#{ATTRIBUTE_REGEX}/) do
+      resource_data = resource_data.gsub(/^\s*\#\<\n(.*?)^\s*\#\>\n#{ATTRIBUTE_REGEX}/m) do
         update_attribute($2, $1.gsub(/^\s*\# ?/, ''))
       end
       resource_data = resource_data.gsub(/^\s*\#\<\>\s(.*?$)\n#{ATTRIBUTE_REGEX}/) do

data/lib/knife_cookbook_doc/version.rb

@@ -1,3 +1,3 @@
 module KnifeCookbookDoc
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

data/spec/knife_cookbook_doc/attribute_model_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe KnifeCookbookDoc::AttributesModel do
+  describe '#load_descriptions' do
+    before do
+      allow(IO).to receive(:read).with('attributes/default.rb').and_return(attributes)
+    end
+    let(:attributes) {
+<<EOS
+#<> Single line comment
+default['knife_cookbook_doc']['attr1'] = 'attr1_value'
+
+#<
+# Multiline comment with single line of text
+#>
+default['knife_cookbook_doc']['attr2'] = 'attr2_value'
+
+=begin
+#<
+Multiline begin/end with single line of text
+#>
+=end
+default['knife_cookbook_doc']['attr3'] = 'attr3_value'
+
+#<
+# Multiline comment with
+multiple lines of text
+#>
+default['knife_cookbook_doc']['attr4'] = 'attr4_value'
+
+=begin
+#<
+Multiline begin/end with
+multiple lines of text
+#>
+=end
+default['knife_cookbook_doc']['attr5'] = 'attr5_value'
+EOS
+    }
+    subject do
+      KnifeCookbookDoc::AttributesModel.new('attributes/default.rb').attributes
+    end
+
+    it do
+      is_expected.to include(
+        [
+          "node['knife_cookbook_doc']['attr1']",
+          'Single line comment',
+          'attr1_value',
+          []
+        ]
+      )
+    end
+
+    it do
+      is_expected.to include(
+        [
+          "node['knife_cookbook_doc']['attr2']",
+          'Multiline comment with single line of text',
+          'attr2_value',
+          []
+        ]
+      )
+    end
+
+    it do
+      is_expected.to include(
+        [
+          "node['knife_cookbook_doc']['attr3']",
+          'Multiline begin/end with single line of text',
+          'attr3_value',
+          []
+        ]
+      )
+    end
+
+    it do
+      is_expected.to include(
+        [
+          "node['knife_cookbook_doc']['attr4']",
+          "Multiline comment with\nmultiple lines of text",
+          'attr4_value',
+          []
+        ]
+      )
+    end
+
+    it do
+      is_expected.to include(
+        [
+          "node['knife_cookbook_doc']['attr5']",
+          "Multiline begin/end with\nmultiple lines of text",
+          'attr5_value',
+          []
+        ]
+      )
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'rspec'
+require_relative '../lib/knife_cookbook_doc/attributes_model'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cookbook-doc
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Mathias Lafeldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -53,6 +53,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Knife plugin to generate README.md for a cookbook
 email:
 - mathias.lafeldt@gmail.com
@@ -80,6 +94,8 @@ files:
 - lib/knife_cookbook_doc/recipe_model.rb
 - lib/knife_cookbook_doc/resource_model.rb
 - lib/knife_cookbook_doc/version.rb
+- spec/knife_cookbook_doc/attribute_model_spec.rb
+- spec/spec_helper.rb
 homepage: http://realityforge.github.com/knife-cookbook-doc
 licenses:
 - Apache 2.0
@@ -104,5 +120,7 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Knife plugin to generate README.md for a cookbook
-test_files: []
+test_files:
+- spec/knife_cookbook_doc/attribute_model_spec.rb
+- spec/spec_helper.rb
 has_rdoc: