puppet-blacksmith 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9a6f0b030d273a95e8e0c4c9aa6a2064627e81a8de340568374ababcd78b725
-  data.tar.gz: 65aa44875428323c3863e2fa144eb8bc568018659880494446da84c486062de2
+  metadata.gz: 68eaa41801d5768e1205b5c3042b02c067dcc94359327fb0bed02ab8bcb1d52f
+  data.tar.gz: d705be7631ceaed8ec81cf6f81942bc629d8d1200ff0cf986c6e186e5f56dc17
 SHA512:
-  metadata.gz: 78d1b672f742c6ea6512c80f48fea18565fdce5cb261faa5290544327ef5edea57b24072ac845203f21096fa1fb8ed04f2579a0f5c3775083a47f7a611d83517
-  data.tar.gz: 210e663c53a3bded6079c4056b17c9ce470284444b0ef22ae1e0912ae40bbfdd70a7455a5fb6d9f7d7fdcc22a08e04d52dc00d047cab292448934513edd4d878
+  metadata.gz: 189b01578212e80231f83705d18757bbb600d08765545b43011fb1057b055fc5142cfed5733469eb4f449c14f42a3a2fa1e1c5978a2d8184d4e63215a0f1c2e9
+  data.tar.gz: 5121db4aa26fcef8c6b70c60b44eaadd7a85a985bcaa7e67b55a129694346def44743150866d7287528d002164ba9b9c02b4c0922e1c04e3a8a847d7d889a9e4

data/lib/puppet_blacksmith/modulefile.rb

@@ -21,8 +21,11 @@ module Blacksmith
     def name
       metadata['name'].split('-',2)[1]
     end
+    def namespace
+      metadata['name'].split('-',2)[0]
+    end
     def author
-      metadata['author'] || metadata['name'].split('-',2)[0]
+      metadata['author'] || namespace
     end
     def version
       metadata['version']

data/lib/puppet_blacksmith/rake_tasks.rb

@@ -138,8 +138,8 @@ module Blacksmith
         task :push => :'module:build' do
           m = Blacksmith::Modulefile.new
           forge = Blacksmith::Forge.new
-          puts "Uploading to Puppet Forge #{m.author}/#{m.name}"
-          forge.push!(m.name, nil, m.author, m.version)
+          puts "Uploading to Puppet Forge #{m.namespace}/#{m.name}"
+          forge.push!(m.name, nil, m.namespace, m.version)
         end
 
         desc "Runs clean again"

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '6.0.0'
+  VERSION = '6.0.1'
 end

data/spec/data/metadata-different-author.json

@@ -0,0 +1,36 @@
+{
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "4",
+        "5",
+        "6"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": "3.2.x"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": ">=2.7.20 <7.0.0"
+    }
+  ],
+  "name": "maestrodev-test",
+  "version": "1.0.0",
+  "source": "git://github.com/puppetlabs/puppetlabs-stdlib",
+  "author": "MaestroDev",
+  "license": "Apache 2.0",
+  "summary": "Puppet Module Standard Library",
+  "description": "Standard Library for Puppet Modules",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
+  "dependencies": [
+    {
+      "name": "puppetlabs-stdlib",
+      "version_requirement": ">= 3.0.0"
+    }
+  ]
+}

data/spec/data/metadata-no-author.json

@@ -0,0 +1,35 @@
+{
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "4",
+        "5",
+        "6"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": "3.2.x"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": ">=2.7.20 <7.0.0"
+    }
+  ],
+  "name": "maestrodev-test",
+  "version": "1.0.0",
+  "source": "git://github.com/puppetlabs/puppetlabs-stdlib",
+  "license": "Apache 2.0",
+  "summary": "Puppet Module Standard Library",
+  "description": "Standard Library for Puppet Modules",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
+  "dependencies": [
+    {
+      "name": "puppetlabs-stdlib",
+      "version_requirement": ">= 3.0.0"
+    }
+  ]
+}

data/spec/puppet_blacksmith/modulefile_spec.rb

@@ -11,6 +11,32 @@ describe 'Blacksmith::Modulefile' do
     it { expect(subject.name).to eql("test") }
   end
 
+  context "using different author" do
+    let(:path) { "spec/data/metadata-different-author.json" }
+
+    subject { Blacksmith::Modulefile.new(path) }
+
+    it_behaves_like :metadata
+
+    describe "author and namespace" do
+      it { expect(subject.author).to eql("MaestroDev") }
+      it { expect(subject.namespace).to eql("maestrodev") }
+    end
+  end
+
+  context "using no author" do
+    let(:path) { "spec/data/metadata-no-author.json" }
+
+    subject { Blacksmith::Modulefile.new(path) }
+
+    it_behaves_like :metadata
+
+    describe "author and namespace" do
+      it { expect(subject.author).to eql("maestrodev") }
+      it { expect(subject.namespace).to eql("maestrodev") }
+    end
+  end
+
   context "using metadata.json" do
 
     it_behaves_like :metadata

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - MaestroDev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-modulebuilder
@@ -155,6 +155,8 @@ files:
 - lib/puppet_blacksmith/version.rb
 - lib/puppet_blacksmith/version_helper.rb
 - spec/data/maestrodev-test/metadata.json
+- spec/data/metadata-different-author.json
+- spec/data/metadata-no-author.json
 - spec/data/metadata.json
 - spec/data/response.json
 - spec/puppet_blacksmith/forge_live_spec.rb
@@ -181,8 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Tasks to manage Puppet module builds
@@ -193,6 +194,8 @@ test_files:
 - spec/puppet_blacksmith/modulefile_spec.rb
 - spec/puppet_blacksmith/forge_spec.rb
 - spec/spec_helper.rb
+- spec/data/metadata-different-author.json
+- spec/data/metadata-no-author.json
 - spec/data/maestrodev-test/metadata.json
 - spec/data/response.json
 - spec/data/metadata.json