puppet-strings 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0b022bc727dcda3a4a796595059fa42a79815f2
-  data.tar.gz: 00aebdc79f8e40a6149940a6e495e2cf3b2e356d
+  metadata.gz: 82ad70b526cc76afc1aa63fe94f18525f3a88ed5
+  data.tar.gz: 11c0250595f96c209f17625cdf7a8a41feee39c3
 SHA512:
-  metadata.gz: c52b785c39bf5e539934a64aea7af0b9f1fe192f0caf6eb327e6c43926d1a9d943ef1ec4c1dec30ebacd779d2694d8bf8f55fc90472f37beb9d7d3dc15b84b3d
-  data.tar.gz: 89ee514938a2f69a69705c79b52598e5b9144a984dcf7ab6a5304dfab6a372fc3686b548936517cd135f7dc8ea13b8ef1951ebb1f430e6dab740384a5f26a191
+  metadata.gz: 55047d29045ebd5f26f52f0f26331b0b602d6d98c7e231b512052e87537664aba1f1b5c00613e07435d5b885683ba3a941941f382b104c3a89270cddbd836794
+  data.tar.gz: 71a37b237fd792a7c3c94acc72514068e24c87a75db75af5cd2f83196b7b100bbd9ab1682ccc54fb8b7d889412bfa806a75542a8cf77d0fc8d5ae87ae4d55803

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [1.2.1](https://github.com/puppetlabs/puppet-strings/tree/1.2.1) (2018-03-01)
+
+[Full Changelog](https://github.com/puppetlabs/puppet-strings/compare/1.2.0...1.2.1)
+
+### Fixed
+
+- (PDOC-224) Handle --emit-json(-stdout) again [\#162](https://github.com/puppetlabs/puppet-strings/pull/162) ([ekohl](https://github.com/ekohl))
+
 ## [1.2.0](https://github.com/puppetlabs/puppet-strings/tree/1.2.0) (2018-02-26)
 
 [Full Changelog](https://github.com/puppetlabs/puppet-strings/compare/1.1.1...1.2.0)
@@ -186,4 +194,4 @@ All related tickets can be found under the [PDOC][PDOC JIRA] JIRA project with t
 - Strings will no longer crash when documenting 3x functions with less than two arguments passed into newfunction **(PDOC-27)**
 
 
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/lib/puppet/face/strings.rb

@@ -116,9 +116,13 @@ Puppet::Face.define(:strings, '0.0.1') do
           generate_options[:markdown] = true
         elsif format.casecmp('json').zero? || options[:emit_json] || options[:emit_json_stdout]
           generate_options[:json] = true
+          generate_options[:path] ||= options[:emit_json] if options[:emit_json]
         else
           raise RuntimeError, "Invalid format #{options[:format]}. Please select 'json' or 'markdown'."
         end
+      elsif options[:emit_json] || options[:emit_json_stdout]
+        generate_options[:json] = true
+        generate_options[:path] ||= options[:emit_json] if options[:emit_json]
       end
     end
     generate_options

data/spec/acceptance/emit_json_options.rb

@@ -52,4 +52,20 @@ describe 'Emitting JSON' do
     output = read_file_on(master, tmpfile)
     expect(JSON.parse(output)).to eq(expected)
   end
+
+  it 'should emit JSON to stdout when using --emit-json-stdout' do
+    test_module_path = get_test_module_path(master, /Module test/)
+    on master, puppet('strings', 'generate', '--emit-json-stdout', "#{test_module_path}/lib/puppet/parser/functions/function3x.rb") do
+      output = stdout.chomp
+      expect(JSON.parse(output)).to eq(expected)
+    end
+  end
+
+  it 'should write JSON to a file when using --emit-json' do
+    test_module_path = get_test_module_path(master, /Module test/)
+    tmpfile = master.tmpfile('json_output.json')
+    on master, puppet('strings', 'generate', '--emit-json', tmpfile, "#{test_module_path}/lib/puppet/parser/functions/function3x.rb")
+    output = read_file_on(master, tmpfile)
+    expect(JSON.parse(output)).to eq(expected)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-strings
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Puppet Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard