Remove pre-condition checks for RSAPI objects

lib/pdk/generate.rb

@@ -7,7 +7,6 @@ module Generate
     autoload :Provider, 'pdk/generate/provider'
     autoload :PuppetClass, 'pdk/generate/puppet_class'
     autoload :PuppetObject, 'pdk/generate/puppet_object'
-    autoload :ResourceAPIObject, 'pdk/generate/resource_api_object'
     autoload :Task, 'pdk/generate/task'
     autoload :Transport, 'pdk/generate/transport'
 

lib/pdk/generate/provider.rb

@@ -2,7 +2,7 @@
 
 module PDK
   module Generate
-    class Provider < ResourceAPIObject
+    class Provider < PuppetObject
       def friendly_name
         'Resource API Provider'.freeze
       end

lib/pdk/generate/transport.rb

@@ -2,7 +2,7 @@
 
 module PDK
   module Generate
-    class Transport < ResourceAPIObject
+    class Transport < PuppetObject
       def friendly_name
         'Resource API Transport'.freeze
       end

spec/acceptance/new_provider_spec.rb

@@ -8,115 +8,62 @@ def update_module!
   context 'when run inside of a module' do
     include_context 'in a new module', 'new_provider'
 
-    context 'with the Resource API configured in .sync.yml' do
-      before(:all) do
-        File.open('.sync.yml', 'w') do |f|
-          f.write(<<SYNC)
----
-Gemfile:
-  optional:
-    ':development':
-      - gem: 'puppet-resource_api'
-spec/spec_helper.rb:
-  mock_with: ':rspec'
-SYNC
-        end
-        update_module!
+    describe command('pdk new provider test_provider') do
+      its(:stdout) { is_expected.to match(%r{#{File.join('lib', 'puppet', 'type', 'test_provider.rb')}}) }
+      its(:stdout) { is_expected.to match(%r{#{File.join('lib', 'puppet', 'provider', 'test_provider', 'test_provider.rb')}}) }
+      its(:stdout) { is_expected.to match(%r{#{File.join('spec', 'unit', 'puppet', 'provider', 'test_provider', 'test_provider_spec.rb')}}) }
+      its(:stdout) { is_expected.to match(%r{#{File.join('spec', 'unit', 'puppet', 'type', 'test_provider_spec.rb')}}) }
+      its(:stderr) { is_expected.to have_no_output }
+      its(:exit_status) { is_expected.to eq(0) }
+
+      describe file(File.join('lib', 'puppet', 'type')) do
+        it { is_expected.to be_directory }
       end
 
-      describe command('pdk new provider test_provider') do
-        its(:stdout) { is_expected.to match(%r{#{File.join('lib', 'puppet', 'type', 'test_provider.rb')}}) }
-        its(:stdout) { is_expected.to match(%r{#{File.join('lib', 'puppet', 'provider', 'test_provider', 'test_provider.rb')}}) }
-        its(:stdout) { is_expected.to match(%r{#{File.join('spec', 'unit', 'puppet', 'provider', 'test_provider', 'test_provider_spec.rb')}}) }
-        its(:stdout) { is_expected.to match(%r{#{File.join('spec', 'unit', 'puppet', 'type', 'test_provider_spec.rb')}}) }
-        its(:stderr) { is_expected.to have_no_output }
-        its(:exit_status) { is_expected.to eq(0) }
-
-        describe file(File.join('lib', 'puppet', 'type')) do
-          it { is_expected.to be_directory }
-        end
-
-        describe file(File.join('lib', 'puppet', 'type', 'test_provider.rb')) do
-          it { is_expected.to be_file }
-          its(:content) { is_expected.to match(%r{Puppet::ResourceApi.register_type}) }
-          its(:content) { is_expected.to match(%r{name: 'test_provider'}) }
-        end
-
-        describe file(File.join('lib', 'puppet', 'provider', 'test_provider')) do
-          it { is_expected.to be_directory }
-        end
-
-        describe file(File.join('lib', 'puppet', 'provider', 'test_provider', 'test_provider.rb')) do
-          it { is_expected.to be_file }
-          its(:content) { is_expected.to match(%r{class Puppet::Provider::TestProvider::TestProvider}) }
-        end
-
-        describe file(File.join('spec', 'unit', 'puppet', 'provider', 'test_provider')) do
-          it { is_expected.to be_directory }
-        end
-
-        describe file(File.join('spec', 'unit', 'puppet', 'provider', 'test_provider', 'test_provider_spec.rb')) do
-          it { is_expected.to be_file }
-          its(:content) { is_expected.to match(%r{RSpec.describe Puppet::Provider::TestProvider::TestProvider do}) }
-        end
-
-        describe file(File.join('spec', 'unit', 'puppet', 'type')) do
-          it { is_expected.to be_directory }
-        end
+      describe file(File.join('lib', 'puppet', 'type', 'test_provider.rb')) do
+        it { is_expected.to be_file }
+        its(:content) { is_expected.to match(%r{Puppet::ResourceApi.register_type}) }
+        its(:content) { is_expected.to match(%r{name: 'test_provider'}) }
+      end
 
-        describe file(File.join('spec', 'unit', 'puppet', 'type', 'test_provider_spec.rb')) do
-          it { is_expected.to be_file }
-          its(:content) { is_expected.to match(%r{RSpec.describe 'the test_provider type' do}) }
-        end
+      describe file(File.join('lib', 'puppet', 'provider', 'test_provider')) do
+        it { is_expected.to be_directory }
+      end
 
-        describe command('pdk validate ruby') do
-          its(:stdout) { is_expected.to have_no_output }
-          its(:stderr) { is_expected.to match(%r{using ruby \d+\.\d+\.\d+}i) }
-          its(:stderr) { is_expected.to match(%r{using puppet \d+\.\d+\.\d+}i) }
-          its(:exit_status) { is_expected.to eq(0) }
-        end
+      describe file(File.join('lib', 'puppet', 'provider', 'test_provider', 'test_provider.rb')) do
+        it { is_expected.to be_file }
+        its(:content) { is_expected.to match(%r{class Puppet::Provider::TestProvider::TestProvider}) }
+      end
 
-        describe command('pdk test unit') do
-          its(:stdout) { is_expected.to match(%r{0 failures}) }
-          its(:stdout) { is_expected.not_to match(%r{no examples found}i) }
-          its(:exit_status) { is_expected.to eq(0) }
-        end
+      describe file(File.join('spec', 'unit', 'puppet', 'provider', 'test_provider')) do
+        it { is_expected.to be_directory }
       end
-    end
 
-    context 'without a .sync.yml' do
-      before(:all) do
-        FileUtils.rm_f('.sync.yml')
-        update_module!
+      describe file(File.join('spec', 'unit', 'puppet', 'provider', 'test_provider', 'test_provider_spec.rb')) do
+        it { is_expected.to be_file }
+        its(:content) { is_expected.to match(%r{RSpec.describe Puppet::Provider::TestProvider::TestProvider do}) }
       end
 
-      describe command('pdk new provider test_provider2') do
-        its(:stderr) { is_expected.to match(%r{pdk \(ERROR\): .sync.yml not found}i) }
-        its(:stdout) { is_expected.to have_no_output }
-        its(:exit_status) { is_expected.not_to eq(0) }
+      describe file(File.join('spec', 'unit', 'puppet', 'type')) do
+        it { is_expected.to be_directory }
       end
-    end
 
-    context 'with invalid .sync.yml' do
-      before(:all) do
-        File.open('.sync.yml', 'w') do |f|
-          f.write(<<SYNC)
----
-Gemfile:
-  optional:
-    ':test':
-      - gem: 'puppet-resource_api'
-spec/spec_helper.rb:
-  mock_with: ':rspec'
-SYNC
-        end
-        update_module!
+      describe file(File.join('spec', 'unit', 'puppet', 'type', 'test_provider_spec.rb')) do
+        it { is_expected.to be_file }
+        its(:content) { is_expected.to match(%r{RSpec.describe 'the test_provider type' do}) }
       end
 
-      describe command('pdk new provider test_provider2') do
-        its(:stderr) { is_expected.to match(%r{pdk \(ERROR\): Gemfile.optional.:development configuration not found}i) }
+      describe command('pdk validate ruby') do
         its(:stdout) { is_expected.to have_no_output }
-        its(:exit_status) { is_expected.not_to eq(0) }
+        its(:stderr) { is_expected.to match(%r{using ruby \d+\.\d+\.\d+}i) }
+        its(:stderr) { is_expected.to match(%r{using puppet \d+\.\d+\.\d+}i) }
+        its(:exit_status) { is_expected.to eq(0) }
+      end
+
+      describe command('pdk test unit') do
+        its(:stdout) { is_expected.to match(%r{0 failures}) }
+        its(:stdout) { is_expected.not_to match(%r{no examples found}i) }
+        its(:exit_status) { is_expected.to eq(0) }
       end
     end
   end