contentful_bootstrap 3.10.0 → 3.11.0

data/lib/contentful/bootstrap/templates/links/base.rb

@@ -25,7 +25,7 @@ module Contentful
           end
 
           def management_class
-            fail 'must implement'
+            raise 'must implement'
           end
 
           def ==(other)

data/lib/contentful/bootstrap/token.rb

@@ -66,7 +66,7 @@ module Contentful
       end
 
       def config_file
-        @file ||= ::File.exist?(filename) ? IniFile.load(filename) : IniFile.new(filename: filename)
+        @config_file ||= ::File.exist?(filename) ? IniFile.load(filename) : IniFile.new(filename: filename)
       end
     end
   end

data/lib/contentful/bootstrap/version.rb

@@ -1,6 +1,6 @@
 module Contentful
   module Bootstrap
-    VERSION = '3.10.0'
+    VERSION = '3.11.0'.freeze
 
     def self.major_version
       VERSION.split('.').first.to_i

data/spec/contentful/bootstrap/command_runner_spec.rb

@@ -101,7 +101,7 @@ describe Contentful::Bootstrap::CommandRunner do
         allow_any_instance_of(Contentful::Bootstrap::Commands::GenerateJson).to receive(:run)
 
         expect(Contentful::Bootstrap::Commands::GenerateJson).to receive(:new).with(
-          'foo', 'bar', nil, false, false, false, []
+          'foo', 'bar', 'master', nil, false, false, false, []
         ).and_call_original
 
         subject.generate_json('foo', access_token: 'bar')
@@ -111,7 +111,7 @@ describe Contentful::Bootstrap::CommandRunner do
         allow_any_instance_of(Contentful::Bootstrap::Commands::GenerateJson).to receive(:run)
 
         expect(Contentful::Bootstrap::Commands::GenerateJson).to receive(:new).with(
-          'foo', 'bar', 'baz', true, false, false, []
+          'foo', 'bar', 'master', 'baz', true, false, false, []
         ).and_call_original
 
         subject.generate_json('foo', access_token: 'bar', filename: 'baz', content_types_only: true)

data/spec/contentful/bootstrap/commands/base_spec.rb

@@ -27,22 +27,10 @@ describe Contentful::Bootstrap::Commands::Base do
         described_class.new(token, 'foo', trigger_oauth: false, quiet: true)
       end
     end
-
-    describe 'management_client_init' do
-      it 'runs management_client_init when trigger_oauth is true' do
-        expect_any_instance_of(described_class).to receive(:management_client_init)
-        described_class.new(token, 'foo', quiet: true)
-      end
-
-      it 'doesnt run management_client_init when trigger_oauth is false' do
-        expect_any_instance_of(described_class).not_to receive(:management_client_init)
-        described_class.new(token, 'foo', trigger_oauth: false, quiet: true)
-      end
-    end
   end
 
   describe 'instance methods' do
-    it '#management_client_init' do
+    it '#client' do
       allow_any_instance_of(described_class).to receive(:configuration)
       expect(Contentful::Management::Client).to receive(:new).with(
         token.read,
@@ -57,7 +45,7 @@ describe Contentful::Bootstrap::Commands::Base do
 
     describe '#configuration' do
       before do
-        allow_any_instance_of(subject.class).to receive(:management_client_init)
+        allow_any_instance_of(subject.class).to receive(:client)
       end
 
       it 'passes if token is found' do
@@ -80,7 +68,7 @@ describe Contentful::Bootstrap::Commands::Base do
     end
 
     it '#token_server' do
-      allow_any_instance_of(described_class).to receive(:management_client_init)
+      allow_any_instance_of(described_class).to receive(:client)
 
       expect(Contentful::Bootstrap::Support).to receive(:gets) { "y" }
       expect_any_instance_of(Contentful::Bootstrap::Server).to receive(:start) {}

data/spec/contentful/bootstrap/commands/create_space_spec.rb

@@ -136,7 +136,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
     end
 
     context 'with no_publish set to true' do
-      subject { described_class.new token, 'foo', json_template: 'bar', trigger_oauth: false, quiet: true, no_publish: true }
+      subject { described_class.new token, 'foo', environment: 'master', json_template: 'bar', trigger_oauth: false, quiet: true, no_publish: true }
 
       it 'calls JsonTemplate with no_publish' do
         allow(Contentful::Bootstrap::Support).to receive(:gets).and_return('y')
@@ -148,7 +148,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
         expect(subject).to receive(:fetch_space) { space_double }
         expect(mock_template).to receive(:run)
 
-        expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', false, true, true, false, true) { mock_template }
+        expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', 'master', false, true, true, false, true) { mock_template }
 
         subject.run
       end

data/spec/contentful/bootstrap/commands/generate_json_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Contentful::Bootstrap::Commands::GenerateJson do
-  subject { Contentful::Bootstrap::Commands::GenerateJson.new('foo', 'bar') }
+  subject { described_class.new('foo', 'bar') }
 
   describe 'instance methods' do
     describe '#run' do

data/spec/contentful/bootstrap/commands/generate_token_spec.rb

@@ -23,7 +23,7 @@ describe Contentful::Bootstrap::Commands::GenerateToken do
 
   describe 'instance methods' do
     before do
-      subject.send(:management_client_init)
+      subject.send(:client)
     end
 
     describe '#run' do

data/spec/contentful/bootstrap/commands/update_space_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Contentful::Bootstrap::Commands::UpdateSpace do
   let(:path) { File.expand_path(File.join('spec', 'fixtures', 'ini_fixtures', 'contentfulrc.ini')) }
   let(:token) { Contentful::Bootstrap::Token.new path }
-  subject { described_class.new token, 'foo', json_template: 'bar', mark_processed: false, trigger_oauth: false, quiet: true }
+  subject { described_class.new token, 'foo', environment: 'master', json_template: 'bar', mark_processed: false, trigger_oauth: false, quiet: true }
   let(:space_double) { SpaceDouble.new }
 
   before do
@@ -42,7 +42,7 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
       describe 'runs JSON Template without already processed elements' do
         [true, false].each do |mark_processed|
           context "mark_processed is #{mark_processed}" do
-            subject { described_class.new token, 'foo', json_template: 'bar', mark_processed: mark_processed, trigger_oauth: false, quiet: true}
+            subject { described_class.new token, 'foo', environment: 'master', json_template: 'bar', mark_processed: mark_processed, trigger_oauth: false, quiet: true}
 
             it "calls JsonTemplate with mark_processed as #{mark_processed}" do
               allow(::File).to receive(:exist?) { true }
@@ -52,7 +52,7 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
               expect(subject).to receive(:fetch_space) { space_double }
               expect(mock_template).to receive(:run)
 
-              expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', mark_processed, true, true, false, false) { mock_template }
+              expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', 'master', mark_processed, true, true, false, false) { mock_template }
 
               subject.run
             end
@@ -71,14 +71,14 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
           expect(subject).to receive(:fetch_space) { space_double }
           expect(mock_template).to receive(:run)
 
-          expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', false, true, true, true, false) { mock_template }
+          expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', 'master', false, true, true, true, false) { mock_template }
 
           subject.run
         end
       end
 
       context 'with no_publish set to true' do
-        subject { described_class.new token, 'foo', json_template: 'bar', trigger_oauth: false, skip_content_types: true, quiet: true, no_publish: true }
+        subject { described_class.new token, 'foo', environment: 'master', json_template: 'bar', trigger_oauth: false, skip_content_types: true, quiet: true, no_publish: true }
 
         it 'calls JsonTemplate with no_publish' do
           allow(::File).to receive(:exist?) { true }
@@ -88,7 +88,7 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
           expect(subject).to receive(:fetch_space) { space_double }
           expect(mock_template).to receive(:run)
 
-          expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', false, true, true, true, true) { mock_template }
+          expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', 'master', false, true, true, true, true) { mock_template }
 
           subject.run
         end
@@ -106,7 +106,7 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
     it 'can update localized spaces' do
       vcr('update_space_localized') {
         json_path = File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'update_space_localized.json'))
-        subject = described_class.new(token, 'vsy1ouf6jdcq', locale: 'es-AR', json_template: json_path, mark_processed: false, trigger_oauth: false, quiet: true)
+        subject = described_class.new(token, 'vsy1ouf6jdcq', environment: 'master', locale: 'es-AR', json_template: json_path, mark_processed: false, trigger_oauth: false, quiet: true)
 
         subject.run
       }
@@ -128,7 +128,7 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
     it 'can update an existing asset and keep it as draft' do
       vcr('update_existing_asset') {
         json_path = File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'assets_draft.json'))
-        subject = described_class.new(token, 'f3abi4dqvrhg', json_template: json_path, no_publish: true, trigger_oauth: false, quiet: true)
+        subject = described_class.new(token, 'f3abi4dqvrhg', environment: 'master', json_template: json_path, no_publish: true, trigger_oauth: false, quiet: true)
 
         subject.run
       }
@@ -157,5 +157,33 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
         expect(delivery_cat.title).to eq 'Foo'
       }
     end
+
+    it 'can update a specific environment different than master' do
+      delivery_client = nil
+      vcr('check_original_staging_environment_status') {
+        delivery_client = Contentful::Client.new(
+          space: '9utsm1g0t7f5',
+          access_token: 'a67d4d9011f6d6c1dfe4169d838114d3d3849ab6df6fb1d322cf3ee91690fae4',
+          environment: 'staging',
+          dynamic_entries: :auto,
+          raise_errors: true
+        )
+
+        expect(delivery_client.entries.size).to eq 1
+      }
+
+      vcr('update_with_environment') {
+        json_path = File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'environment_template.json'))
+        subject = described_class.new(token, '9utsm1g0t7f5', environment: 'staging', json_template: json_path, trigger_oauth: false, quiet: true)
+
+        subject.run
+      }
+
+      vcr('check_staging_environment_status') {
+        entries = delivery_client.entries
+        expect(entries.size).to eq 2
+        expect(entries.items.detect { |i| i.id == 'foo_update' }.name).to eq 'Test updated'
+      }
+    end
   end
 end

data/spec/contentful/bootstrap/generator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Contentful::Bootstrap::Generator do
-  subject { Contentful::Bootstrap::Generator.new('wl1z0pal05vy', '48d7db7d4cd9d09df573c251d456f4acc72141b92f36e57f8684b36cf5cfff6e', false, false, []) }
+  subject { described_class.new('wl1z0pal05vy', '48d7db7d4cd9d09df573c251d456f4acc72141b92f36e57f8684b36cf5cfff6e', 'master', false, false, []) }
 
   describe 'user agent headers' do
     it 'client has proper integration data' do
@@ -19,7 +19,7 @@ describe Contentful::Bootstrap::Generator do
     end
 
     context 'with content_types_only set to true' do
-      subject { Contentful::Bootstrap::Generator.new('wl1z0pal05vy', '48d7db7d4cd9d09df573c251d456f4acc72141b92f36e57f8684b36cf5cfff6e', true, false, []) }
+      subject { described_class.new('wl1z0pal05vy', '48d7db7d4cd9d09df573c251d456f4acc72141b92f36e57f8684b36cf5cfff6e', 'master', true, false, []) }
 
       it 'can generate a JSON template for a given space with only Content Types' do
         vcr('generate_json_content_types_only') {
@@ -30,4 +30,19 @@ describe Contentful::Bootstrap::Generator do
       end
     end
   end
+
+  describe 'integration' do
+    subject { described_class.new('9utsm1g0t7f5', 'a67d4d9011f6d6c1dfe4169d838114d3d3849ab6df6fb1d322cf3ee91690fae4', 'staging', false, false, []) }
+    it 'can generate templates from an environment' do
+      vcr('generate_json_environments') {
+        unparsed_json = subject.generate_json
+        json = JSON.load(unparsed_json)
+
+        json_fixture('environment_template') { |fixture|
+          expect(json).to eq fixture
+        }
+        expect(json['entries']['foo'].size).to eq 2
+      }
+    end
+  end
 end

data/spec/contentful/bootstrap/templates/base_spec.rb

@@ -2,7 +2,15 @@ require 'spec_helper'
 
 describe Contentful::Bootstrap::Templates::Base do
   let(:space) { Contentful::Management::Space.new }
-  subject { described_class.new(space, true) }
+  subject { described_class.new(space, 'master', true) }
+
+  before :each do
+    environment_proxy = Object.new
+    allow(space).to receive(:environments) { environment_proxy }
+
+    environment = Object.new
+    allow(environment_proxy).to receive(:find) { environment }
+  end
 
   describe 'instance methods' do
     it '#content_types' do
@@ -33,7 +41,7 @@ describe Contentful::Bootstrap::Templates::Base do
       end
 
       context 'with skip_content_types set to true' do
-        subject { described_class.new(space, true, true) }
+        subject { described_class.new(space, 'master', true, true) }
 
         it 'doesnt call create_content_type if skip_content_types is sent' do
           expect(subject).to receive(:create_entries)
@@ -45,10 +53,4 @@ describe Contentful::Bootstrap::Templates::Base do
       end
     end
   end
-
-  describe 'attributes' do
-    it ':space' do
-      expect(subject.space).to eq space
-    end
-  end
 end

data/spec/contentful/bootstrap/templates/blog_spec.rb

@@ -2,7 +2,15 @@ require 'spec_helper'
 
 describe Contentful::Bootstrap::Templates::Blog do
   let(:space) { Contentful::Management::Space.new }
-  subject { Contentful::Bootstrap::Templates::Blog.new(space) }
+  subject { described_class.new(space, 'master') }
+
+  before :each do
+    environment_proxy = Object.new
+    allow(space).to receive(:environments) { environment_proxy }
+
+    environment = Object.new
+    allow(environment_proxy).to receive(:find) { environment }
+  end
 
   describe 'content types' do
     it 'has Post content type' do

data/spec/contentful/bootstrap/templates/catalogue_spec.rb

@@ -2,7 +2,15 @@ require 'spec_helper'
 
 describe Contentful::Bootstrap::Templates::Catalogue do
   let(:space) { Contentful::Management::Space.new }
-  subject { Contentful::Bootstrap::Templates::Catalogue.new(space) }
+  subject { described_class.new(space, 'master') }
+
+  before :each do
+    environment_proxy = Object.new
+    allow(space).to receive(:environments) { environment_proxy }
+
+    environment = Object.new
+    allow(environment_proxy).to receive(:find) { environment }
+  end
 
   describe 'content types' do
     it 'has Brand content type' do

data/spec/contentful/bootstrap/templates/gallery_spec.rb

@@ -2,7 +2,15 @@ require 'spec_helper'
 
 describe Contentful::Bootstrap::Templates::Gallery do
   let(:space) { Contentful::Management::Space.new }
-  subject { Contentful::Bootstrap::Templates::Gallery.new(space) }
+  subject { described_class.new(space) }
+
+  before :each do
+    environment_proxy = Object.new
+    allow(space).to receive(:environments) { environment_proxy }
+
+    environment = Object.new
+    allow(environment_proxy).to receive(:find) { environment }
+  end
 
   describe 'content types' do
     it 'has Author content type' do

data/spec/contentful/bootstrap/templates/json_template_spec.rb

@@ -3,7 +3,15 @@ require 'spec_helper'
 describe Contentful::Bootstrap::Templates::JsonTemplate do
   let(:space) { Contentful::Management::Space.new }
   let(:path) { json_path('simple') }
-  subject { described_class.new space, path, false, true, true }
+  subject { described_class.new space, path, 'master', false, true, true }
+
+  before :each do
+    environment_proxy = Object.new
+    allow(space).to receive(:environments) { environment_proxy }
+
+    environment = Object.new
+    allow(environment_proxy).to receive(:find) { environment }
+  end
 
   before do
     allow(::File).to receive(:write)
@@ -35,7 +43,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
       end
 
       it 'uses display_field if not' do
-        subject = described_class.new(space, File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'display_field.json')), false, true, true)
+        subject = described_class.new(space, File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'display_field.json')), 'master', false, true, true)
 
         expect(subject.content_types.first['displayField']).to eq 'name'
       end
@@ -127,7 +135,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
         expect(json['contentTypes'].size).to eq(2)
         expect(json['contentTypes'].last['id']).to eq('dog')
 
-        subject = described_class.new(space, processed_path, false, false)
+        subject = described_class.new(space, processed_path, 'master', false, false)
 
         expect(subject.content_types.size).to eq(1)
         expect(subject.content_types.first['id']).to eq('cat')
@@ -139,7 +147,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
         expect(json['assets'].size).to eq(2)
         expect(json['assets'].last['id']).to eq('dog_asset')
 
-        subject = described_class.new(space, processed_path, false, false)
+        subject = described_class.new(space, processed_path, 'master', false, false)
 
         expect(subject.assets.size).to eq(1)
         expect(subject.assets.first['id']).to eq('cat_asset')
@@ -151,7 +159,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
         expect(json['entries']['dog'].size).to eq(1)
         expect(json['entries']['dog'].first['sys']['id']).to eq('doge')
 
-        subject = described_class.new(space, processed_path, false, false)
+        subject = described_class.new(space, processed_path, 'master', false, false)
 
         expect(subject.entries['dog'].size).to eq(0)
       }
@@ -160,7 +168,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
 
   describe 'mark processed' do
     it 'does not write file after run if not mark_processed' do
-      subject = described_class.new(space, path, false, false)
+      subject = described_class.new(space, path, 'master', false, false)
       ['content_types', 'assets', 'entries'].each do |n|
         allow(subject).to receive("create_#{n}".to_sym)
       end
@@ -172,7 +180,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
     end
 
     it 'writes file after run if mark_processed' do
-      subject = described_class.new(space, path, true, false)
+      subject = described_class.new(space, path, 'master', true, false)
       ['content_types', 'assets', 'entries'].each do |n|
         allow(subject).to receive("create_#{n}".to_sym)
       end
@@ -229,7 +237,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
 
   describe 'skip_content_types' do
     context 'with skip_content_types set to true' do
-      subject { described_class.new(space, path, false, false, true, true) }
+      subject { described_class.new(space, path, 'master', false, false, true, true) }
 
       it 'skips content type creation' do
         ['assets', 'entries'].each do |n|
@@ -245,7 +253,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
     end
 
     context 'with skip_content_types set to false' do
-      subject { described_class.new(space, path, false, false, true, false) }
+      subject { described_class.new(space, path, 'master', false, false, true, false) }
 
       it 'doesnt skip content type creation' do
         ['assets', 'entries', 'content_types'].each do |n|

data/spec/fixtures/json_fixtures/environment_template.json

@@ -0,0 +1,47 @@
+{
+  "version": 3,
+  "contentTypes": [
+    {
+      "id": "foo",
+      "name": "Foo",
+      "displayField": "name",
+      "fields": [
+        {
+          "id": "name",
+          "name": "Name",
+          "type": "Symbol"
+        },
+        {
+          "id": "content",
+          "name": "Content",
+          "type": "Text"
+        }
+      ]
+    }
+  ],
+  "assets": [
+
+  ],
+  "entries": {
+    "foo": [
+      {
+        "sys": {
+          "id": "6yVdruR4GsKO2iKOqQS2CS"
+        },
+        "fields": {
+          "name": "Test",
+          "content": "Some content"
+        }
+      },
+      {
+        "sys": {
+          "id": "foo_update"
+        },
+        "fields": {
+          "name": "Test updated",
+          "content": "Some content"
+        }
+      }
+    ]
+  }
+}