contentful_bootstrap 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 707aaf25b774e94bc57a7a4fcbafca299a087c0b
-  data.tar.gz: 931621f83a894b336f81fcd65b729dcd90c0e03f
+  metadata.gz: aed4d8f7790b4347e4b97050a049803f83ec1384
+  data.tar.gz: 91d3a12fd648ab548711294e39e9399bbb4c6e03
 SHA512:
-  metadata.gz: 4c306b28133c2411c327b6ee266ad8ec04f9eaa1284dc40a82dd798b8c332f1571c856bd010c7ebb330e45696ef2f3bb483d9b1771e13bf8bca074edba074a90
-  data.tar.gz: 20b2c92ab22e7b511fafb1cb9735e72a4fd8ec9ca0d37829d346245add717c80041dcc99594605dd72e1e4954a90ede31b5cb0110d4c372a7cba17f455e896a3
+  metadata.gz: a862d0a72856f0707f3ab2cd5920cef7484ea06b051cc308a6e03b45af3b60006dd86c86c4ffa23a9feaf8ed34e6811e813a24d5076bca28abe2d85e47ff2969
+  data.tar.gz: 31596e9e9211c8ec76daff969d3a79c2ea9aa6e7901ede6ab0b4b63ab7b1b4ecb7627664db8708c3841fc21fe425b96845a96a4eab0e43d519148fc0a5574faa

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## v3.2.0
+### Added
+* Adds `update_space` command to update already existing spaces using JSON Templates
+* Adds `--mark-processed` option to `create_space` and `update_space` to enforce marking which resources have already been processed
+
 ## v3.1.1
 ### Fixed
 * Fixes a bug where `display_field` was not properly populated when being generated from JSON templates [#35](https://github.com/contentful/contentful-bootstrap.rb/issues/35)

data/README.md

@@ -26,7 +26,7 @@ $ gem install contentful_bootstrap
 You can create spaces by doing:
 
 ```bash
-$ contentful_bootstrap create_space <space_name> [--template template_name] [--json-template template_path] [--config CONFIG_PATH]
+$ contentful_bootstrap create_space <space_name> [--template template_name] [--json-template template_path] [--mark-processed] [--config CONFIG_PATH]
 ```
 
 You can also generate new Delivery API Tokens by doing:
@@ -41,6 +41,12 @@ You can also generate JSON Templates from existing spaces by doing:
 $ contentful_bootstrap generate_json <space_id> <access_token> [--output-file OUTPUT PATH]
 ```
 
+You can update existing spaces from JSON Templates by doing:
+
+```bash
+$ contentful_bootstrap update_space <space_id> -j template_path [--mark-processed]
+```
+
 ### Built-in templates
 
 Just getting started with Contentful? We have included the following built-in templates:
@@ -81,11 +87,23 @@ Additionally, you can send an options hash with the following keys:
 options = {
   template: "blog", # Will use one of the predefined templates and create Content Types, Assets and Entries
   json_template: "/path/to/template.json", # Will use the JSON file specified as a Template
+  mark_processed: false, # if true will mark all resources as 'bootstrapProcessed' and will be avoided for update_space calls (doesnt affect create_space)
   trigger_oauth: true # if true will trigger OAuth process
 }
 Contentful::Bootstrap::CommandRunner.new.create_space("space_name", options)
 ```
 
+To Update an existing Space
+
+```ruby
+options = {
+  json_template: "/path/to/template.json", # Will use the JSON file specified as a Template
+  mark_processed: false, # if true will mark all resources as 'bootstrapProcessed and will be avoided on future update_space calls
+  trigger_oauth: true # if true will trigger OAuth process
+}
+Contentful::Bootstrap::CommandRunner.new.update_space("space_id", options)
+```
+
 To Create a new Delivery API Token
 
 ```ruby
@@ -147,6 +165,9 @@ Using the `--json-template` option, you can create spaces with your own predefin
 This can be useful for creating testing & development spaces or just starting new projects from
 a common baseline. You can find a complete example [here](./examples/templates/catalogue.json)
 
+Using the `--mark-processed` option alongside `--json-template` will mark all resources as `bootstrapProcessed`,
+which will make it so `update_space` calls avoid already created resources. (A resource being either a Content Type, Entry or Asset).
+
 ## Contributing
 
 Feel free to improve this tool by submitting a Pull Request. For more information,

data/bin/contentful_bootstrap

@@ -7,13 +7,31 @@ options = {}
 
 subcommands = {
   'create_space' => OptionParser.new do |opts|
-    opts.banner = "Usage: create_space <space_name> [--template TEMPLATE_NAME] [--json-template JSON_PATH] [--config CONFIG_PATH]"
+    opts.banner = "Usage: create_space <space_name> [--template TEMPLATE_NAME] [--json-template JSON_PATH] [--mark-processed] [--config CONFIG_PATH]"
     opts.on("-t TEMPLATE", "--template TEMPLATE", "Specify Template", "Available Templates: blog, catalogue, gallery") do |t|
       options[:template] = t
     end
     opts.on("-j JSON_PATH", "--json-template JSON_PATH", "Specify JSON Template Path") do |j|
       options[:json_template] = j
     end
+    opts.on('-m', '--mark-processed', "Mark Processed Items on JSON Templates") do |m|
+      options[:mark_processed] = m
+    end
+    opts.on("-c CONFIG_PATH", "--config CONFIG_PATH", "Specify Configuration Path") do |c|
+      options[:config_path] = c
+    end
+    opts.on_tail("-h", "--help", "Print this message") do
+      puts opts
+    end
+  end,
+  'update_space' => OptionParser.new do |opts|
+    opts.banner = "Usage: update_space <space_id> --json-template JSON_PATH [--mark-processed] [--config CONFIG_PATH]"
+    opts.on("-j JSON_PATH", "--json-template JSON_PATH", "Specify JSON Template Path") do |j|
+      options[:json_template] = j
+    end
+    opts.on('-m', '--mark-processed', "Mark Processed Items on JSON Templates") do |m|
+      options[:mark_processed] = m
+    end
     opts.on("-c CONFIG_PATH", "--config CONFIG_PATH", "Specify Configuration Path") do |c|
       options[:config_path] = c
     end

data/examples/templates/catalogue.json

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "content_types": [
+  "contentTypes": [
     {
       "id": "brand",
       "name": "Brand",
@@ -148,7 +148,7 @@
           "name": "Playsam, Inc",
           "website": "http://www.playsam.com",
           "logo": {
-            "link_type": "Asset",
+            "linkType": "Asset",
             "id": "playsam_image"
           }
         }

data/lib/contentful/bootstrap/command_runner.rb

@@ -14,10 +14,21 @@ module Contentful
       def create_space(space_name, options = {})
         template_name = options.fetch(:template, nil)
         json_template = options.fetch(:json_template, nil)
+        mark_processed = options.fetch(:mark_processed, false)
         trigger_oauth = options.fetch(:trigger_oauth, true)
 
         Contentful::Bootstrap::Commands::CreateSpace.new(
-          @token, space_name, template_name, json_template, trigger_oauth
+          @token, space_name, template_name, json_template, mark_processed, trigger_oauth
+        ).run
+      end
+
+      def update_space(space_id, options = {})
+        json_template = options.fetch(:json_template, nil)
+        mark_processed = options.fetch(:mark_processed, false)
+        trigger_oauth = options.fetch(:trigger_oauth, true)
+
+        Contentful::Bootstrap::Commands::UpdateSpace.new(
+          @token, space_id, json_template, mark_processed, trigger_oauth
         ).run
       end
 

data/lib/contentful/bootstrap/commands.rb

@@ -1,3 +1,4 @@
 require 'contentful/bootstrap/commands/create_space'
+require 'contentful/bootstrap/commands/update_space'
 require 'contentful/bootstrap/commands/generate_token'
 require 'contentful/bootstrap/commands/generate_json'

data/lib/contentful/bootstrap/commands/create_space.rb

@@ -9,10 +9,13 @@ module Contentful
     module Commands
       class CreateSpace < Base
         attr_reader :template_name, :json_template
-        def initialize(token, space_name, template_name = nil, json_template = nil, trigger_oauth = true)
+        def initialize(
+            token, space_name, template_name = nil,
+            json_template = nil, mark_processed = false, trigger_oauth = true)
           super(token, space_name, trigger_oauth)
           @template_name = template_name
           @json_template = json_template
+          @mark_processed = mark_processed
         end
 
         def run
@@ -92,7 +95,7 @@ module Contentful
         def create_json_template(space)
           if ::File.exist?(@json_template)
             puts "Creating JSON Template '#{@json_template}'"
-            Templates::JsonTemplate.new(space, @json_template).run
+            Templates::JsonTemplate.new(space, @json_template, @mark_processed).run
             puts "JSON Template '#{@json_template}' created!"
           else
             puts "JSON Template '#{@json_template}' does not exist. Please check that you specified the correct file name."

data/lib/contentful/bootstrap/commands/update_space.rb

@@ -0,0 +1,59 @@
+require 'contentful/management'
+require 'contentful/management/error'
+require 'contentful/bootstrap/templates'
+require 'contentful/bootstrap/commands/base'
+
+module Contentful
+  module Bootstrap
+    module Commands
+      class UpdateSpace < Base
+        attr_reader :json_template
+        def initialize(token, space_id, json_template = nil, mark_processed = false, trigger_oauth = true)
+          super(token, space_id, trigger_oauth)
+          @json_template = json_template
+          @mark_processed = mark_processed
+        end
+
+        def run
+          if @json_template.nil?
+            puts 'JSON Template not found. Exiting!'
+            exit(1)
+          end
+
+          puts "Updating Space '#{@space}'"
+
+          update_space = fetch_space
+
+          update_json_template(update_space)
+
+          puts
+          puts "Successfully updated Space #{@space}"
+
+          update_space
+        end
+
+        protected
+
+        def fetch_space
+          Contentful::Management::Space.find(@space)
+        rescue Contentful::Management::NotFound
+          puts 'Space Not Found. Exiting!'
+          exit(1)
+        end
+
+        private
+
+        def update_json_template(space)
+          if ::File.exist?(@json_template)
+            puts "Updating from JSON Template '#{@json_template}'"
+            Templates::JsonTemplate.new(space, @json_template, @mark_processed, false).run
+            puts "JSON Template '#{@json_template}' updated!"
+          else
+            puts "JSON Template '#{@json_template}' does not exist. Please check that you specified the correct file name."
+            exit(1)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -16,6 +16,8 @@ module Contentful
           create_content_types
           create_assets
           create_entries
+
+          after_run
         rescue Contentful::Management::Error => e
           error = e.error
           puts "Error at: #{error[:url]}"
@@ -37,6 +39,9 @@ module Contentful
           []
         end
 
+        def after_run
+        end
+
         protected
 
         def create_image(name, url)
@@ -51,34 +56,40 @@ module Contentful
 
         def create_content_types
           content_types.each do |ct|
-            puts "Creating Content Type '#{ct['name']}'"
-
-            fields = []
-            content_type = space.content_types.new
-            content_type.id = ct['id']
-            content_type.name = ct['name']
-            content_type.display_field = ct['display_field']
-
-            ct['fields'].each do |f|
-              field = Contentful::Management::Field.new
-              field.id = f['id']
-              field.name = f['name']
-              field.type = f['type']
-              field.link_type = f['linkType'] if link?(f)
-
-              if array?(f)
-                array_field = Contentful::Management::Field.new
-                array_field.type = f['items']['type']
-                array_field.link_type = f['items']['linkType']
-                field.items = array_field
+            begin
+              puts "Creating Content Type '#{ct['name']}'"
+
+              fields = []
+              content_type = space.content_types.new
+              content_type.id = ct['id']
+              content_type.name = ct['name']
+              content_type.display_field = ct['display_field']
+              content_type.description = ct['description']
+
+              ct['fields'].each do |f|
+                field = Contentful::Management::Field.new
+                field.id = f['id']
+                field.name = f['name']
+                field.type = f['type']
+                field.link_type = f['linkType'] if link?(f)
+
+                if array?(f)
+                  array_field = Contentful::Management::Field.new
+                  array_field.type = f['items']['type']
+                  array_field.link_type = f['items']['linkType']
+                  field.items = array_field
+                end
+
+                fields << field
               end
 
-              fields << field
+              content_type.fields = fields
+              content_type.save
+              content_type.activate
+            rescue Contentful::Management::Conflict
+              puts "ContentType '#{ct['id']}' already created! Skipping"
+              next
             end
-
-            content_type.fields = fields
-            content_type.save
-            content_type.activate
           end
         end
 
@@ -92,23 +103,28 @@ module Contentful
 
         def create_assets
           assets.each do |asset|
-            puts "Creating Asset '#{asset['title']}'"
-            asset = space.assets.create(
-              id: asset['id'],
-              title: asset['title'],
-              file: asset['file']
-            )
-            asset.process_file
-
-            attempts = 0
-            while attempts < 10
-              unless space.assets.find(asset.id).file.url.nil?
-                asset.publish
-                break
-              end
+            begin
+              puts "Creating Asset '#{asset['title']}'"
+              asset = space.assets.create(
+                id: asset['id'],
+                title: asset['title'],
+                file: asset['file']
+              )
+              asset.process_file
+
+              attempts = 0
+              while attempts < 10
+                unless space.assets.find(asset.id).file.url.nil?
+                  asset.publish
+                  break
+                end
 
-              sleep(1) # Wait for Process
-              attempts += 1
+                sleep(1) # Wait for Process
+                attempts += 1
+              end
+            rescue Contentful::Management::Conflict
+              puts "Asset '#{asset['id']}' already created! Skipping"
+              next
             end
           end
         end
@@ -150,17 +166,23 @@ module Contentful
                 e[rf.to_sym] = value
               end
 
-              entry = content_type.entries.create({:id => e[:id]})
-              entry.save
-
-              e = e.clone
-              e[:id] = entry.id # in case no ID was specified in template
-              e
+              begin
+                puts "Creating Entry #{e[:id]}"
+                entry = content_type.entries.create({:id => e[:id]})
+                entry.save
+
+                e = e.clone
+                e[:id] = entry.id # in case no ID was specified in template
+              rescue Contentful::Management::Conflict
+                puts "Entry '#{e[:id]}' already exists! Skipping"
+              ensure
+                next e
+              end
             end
           end.flatten
 
           processed_entries = processed_entries.map do |e|
-            puts "Creating Entry #{e[:id]}"
+            puts "Populating Entry #{e[:id]}"
 
             entry = space.entries.find(e[:id])
             e.delete(:id)
@@ -169,7 +191,7 @@ module Contentful
 
             10.times do
               break if space.entries.find(entry.id).sys[:version] >= 4
-              sleep(1)
+              sleep(0.5)
             end
 
             entry.id

data/lib/contentful/bootstrap/templates/json_template.rb

@@ -6,31 +6,53 @@ module Contentful
   module Bootstrap
     module Templates
       class JsonTemplate < Base
-        def initialize(space, file)
+        CONTENT_TYPES_KEY = 'contentTypes'
+        ENTRIES_KEY = 'entries'
+        ASSETS_KEY = 'assets'
+        BOOTSTRAP_PROCCESSED_KEY = 'bootstrapProcessed'
+        DISPLAY_FIELD_KEY = 'display_field'
+        ALTERNATE_DISPLAY_FIELD_KEY = 'displayField'
+        SYS_KEY = 'sys'
+
+        attr_reader :assets, :entries, :content_types
+
+        def initialize(space, file, mark_processed = false, all = true)
           @space = space
           @file = file
-          @assets = nil
-          @entries = nil
+          @all = all
+          @mark_processed = mark_processed
+
           json
 
+          @assets = process_assets
+          @entries = process_entries
+          @content_types = process_content_types
+
           check_version
         end
 
-        def content_types
-          processed_content_types = json.fetch('contentTypes', [])
-          processed_content_types.each do |content_type|
-            content_type['display_field'] = content_type.key?('displayField') ? content_type.delete('displayField') : content_type['display_field']
+        def after_run
+          return unless mark_processed?
+
+          @json.fetch(CONTENT_TYPES_KEY, []).each do |content_type|
+            content_type[BOOTSTRAP_PROCCESSED_KEY] = true
           end
 
-          processed_content_types
-        end
+          @json.fetch(ASSETS_KEY, []).each do |asset|
+            asset[BOOTSTRAP_PROCCESSED_KEY] = true
+          end
 
-        def assets
-          @assets ||= process_assets
-        end
+          @json.fetch(ENTRIES_KEY, {}).each do |_content_type_name, entry_list|
+            entry_list.each do |entry|
+              if entry.key?(SYS_KEY)
+                entry[SYS_KEY][BOOTSTRAP_PROCCESSED_KEY] = true
+              else
+                entry[SYS_KEY] = { BOOTSTRAP_PROCCESSED_KEY => true }
+              end
+            end
+          end
 
-        def entries
-          @entries ||= process_entries
+          ::File.write(@file, JSON.pretty_generate(@json))
         end
 
         private
@@ -45,10 +67,36 @@ module Contentful
 
         def json
           @json ||= ::JSON.parse(::File.read(@file))
+        rescue
+          puts 'File is not JSON. Exiting!'
+          exit(1)
+        end
+
+        def process_content_types
+          processed_content_types = json.fetch(CONTENT_TYPES_KEY, [])
+
+          unless all?
+            processed_content_types = processed_content_types.select do |content_type|
+              !content_type.fetch(BOOTSTRAP_PROCCESSED_KEY, false)
+            end
+          end
+
+          processed_content_types.each do |content_type|
+            content_type[DISPLAY_FIELD_KEY] = content_type.key?(ALTERNATE_DISPLAY_FIELD_KEY) ? content_type.delete(ALTERNATE_DISPLAY_FIELD_KEY) : content_type[DISPLAY_FIELD_KEY]
+          end
+
+          processed_content_types
         end
 
         def process_assets
-          unprocessed_assets = json.fetch('assets', [])
+          unprocessed_assets = json.fetch(ASSETS_KEY, [])
+
+          unless all?
+            unprocessed_assets = unprocessed_assets.select do |asset|
+              !asset.fetch(BOOTSTRAP_PROCCESSED_KEY, false)
+            end
+          end
+
           unprocessed_assets.map do |asset|
             asset['file'] = create_image(
               asset['file']['filename'],
@@ -60,15 +108,22 @@ module Contentful
 
         def process_entries
           processed_entries = {}
-          unprocessed_entries = json.fetch('entries', {})
+          unprocessed_entries = json.fetch(ENTRIES_KEY, {})
           unprocessed_entries.each do |content_type_id, entry_list|
             entries_for_content_type = []
+
+            unless all?
+              entry_list = entry_list.select do |entry|
+                !entry[SYS_KEY].fetch(BOOTSTRAP_PROCCESSED_KEY, false)
+              end
+            end
+
             entry_list.each do |entry|
               processed_entry = {}
               array_fields = []
               link_fields = []
 
-              processed_entry['id'] = entry['sys']['id'] if entry.key?('sys') && entry['sys'].key?('id')
+              processed_entry['id'] = entry[SYS_KEY]['id'] if entry.key?(SYS_KEY) && entry[SYS_KEY].key?('id')
 
               entry.fetch('fields', {}).each do |field, value|
                 link_fields << field if value.is_a? ::Hash
@@ -108,6 +163,14 @@ module Contentful
             Contentful::Bootstrap::Templates::Links::Asset.new(id)
           end
         end
+
+        def all?
+          @all
+        end
+
+        def mark_processed?
+          @mark_processed
+        end
       end
     end
   end

data/lib/contentful/bootstrap/version.rb

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

data/spec/contentful/bootstrap/command_runner_spec.rb

@@ -5,8 +5,6 @@ describe Contentful::Bootstrap::CommandRunner do
   subject { Contentful::Bootstrap::CommandRunner.new(path) }
 
   describe 'instance methods' do
-    before do
-    end
     describe '#create_space' do
       before do
         allow_any_instance_of(Contentful::Bootstrap::Commands::CreateSpace).to receive(:run)
@@ -14,7 +12,7 @@ describe Contentful::Bootstrap::CommandRunner do
 
       it 'default values' do
         expect(Contentful::Bootstrap::Commands::CreateSpace).to receive(:new).with(
-          subject.token, 'foo', nil, nil, true
+          subject.token, 'foo', nil, nil, false, true
         ).and_call_original
 
         subject.create_space('foo')
@@ -22,10 +20,10 @@ describe Contentful::Bootstrap::CommandRunner do
 
       it 'with options' do
         expect(Contentful::Bootstrap::Commands::CreateSpace).to receive(:new).with(
-          subject.token, 'foo', 'bar', 'baz', false
+          subject.token, 'foo', 'bar', 'baz', true, false
         ).and_call_original
 
-        subject.create_space('foo', template: 'bar', json_template: 'baz', trigger_oauth: false)
+        subject.create_space('foo', template: 'bar', json_template: 'baz', mark_processed: true, trigger_oauth: false)
       end
 
       it 'runs command' do
@@ -35,6 +33,34 @@ describe Contentful::Bootstrap::CommandRunner do
       end
     end
 
+    describe '#update_space' do
+      before do
+        allow_any_instance_of(Contentful::Bootstrap::Commands::UpdateSpace).to receive(:run)
+      end
+
+      it 'default values' do
+        expect(Contentful::Bootstrap::Commands::UpdateSpace).to receive(:new).with(
+          subject.token, 'foo', nil, false, true
+        ).and_call_original
+
+        subject.update_space('foo')
+      end
+
+      it 'with options' do
+        expect(Contentful::Bootstrap::Commands::UpdateSpace).to receive(:new).with(
+          subject.token, 'foo', 'bar', true, false
+        ).and_call_original
+
+        subject.update_space('foo', json_template: 'bar', mark_processed: true, trigger_oauth: false)
+      end
+
+      it 'runs command' do
+        expect_any_instance_of(Contentful::Bootstrap::Commands::UpdateSpace).to receive(:run)
+
+        subject.update_space('foo', json_template: 'bar', trigger_oauth: false)
+      end
+    end
+
     describe '#generate_token' do
       before do
         allow_any_instance_of(Contentful::Bootstrap::Commands::GenerateToken).to receive(:run)

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

@@ -3,9 +3,13 @@ require 'spec_helper'
 describe Contentful::Bootstrap::Commands::CreateSpace do
   let(:path) { File.expand_path(File.join('spec', 'fixtures', 'ini_fixtures', 'contentfulrc.ini')) }
   let(:token) { Contentful::Bootstrap::Token.new path }
-  subject { Contentful::Bootstrap::Commands::CreateSpace.new token, 'foo', 'bar', 'baz', false }
+  subject { Contentful::Bootstrap::Commands::CreateSpace.new token, 'foo', 'bar', 'baz', false, false }
   let(:space_double) { SpaceDouble.new }
 
+  before do
+    allow(::File).to receive(:write)
+  end
+
   describe 'instance methods' do
     describe '#run' do
       it 'with all non nil attributes' do
@@ -18,7 +22,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
       end
 
       it 'does not create template when template_name is nil' do
-        create_space_command = described_class.new(token, 'foo', nil, 'baz', false)
+        create_space_command = described_class.new(token, 'foo', nil, 'baz', false, false)
 
         expect(create_space_command.template_name).to eq nil
 
@@ -31,7 +35,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
       end
 
       it 'does not create json template when json_template is nil' do
-        create_space_command = described_class.new(token, 'foo', 'bar', nil, false)
+        create_space_command = described_class.new(token, 'foo', 'bar', nil, false, false)
 
         expect(create_space_command.json_template).to eq nil
 
@@ -62,7 +66,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
       allow_any_instance_of(described_class).to receive(:gets).and_return('y')
       allow_any_instance_of(Contentful::Bootstrap::Commands::GenerateToken).to receive(:gets).and_return('n')
 
-      command = described_class.new(token, 'issue_22', nil, json_path)
+      command = described_class.new(token, 'issue_22', nil, json_path, false)
 
       vcr('issue_22') {
         command.run

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

@@ -0,0 +1,68 @@
+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 { Contentful::Bootstrap::Commands::UpdateSpace.new token, 'foo', 'bar', false, false }
+  let(:space_double) { SpaceDouble.new }
+
+  before do
+    allow(::File).to receive(:write)
+  end
+
+  describe 'instance methods' do
+    describe '#run' do
+      it 'with all non nil attributes' do
+        expect(subject).to receive(:fetch_space) { space_double }
+        expect(subject).to receive(:update_json_template).with(space_double)
+
+        expect(subject.run).to eq(space_double)
+      end
+
+      it 'exits if JSON not sent' do
+        update_space_command = described_class.new(token, 'foo', nil, false)
+
+        expect { update_space_command.run }.to raise_error SystemExit
+      end
+
+      it 'exits if space is not found' do
+        update_space_command = described_class.new(token, 'foo', 'bar', false)
+
+        expect(::Contentful::Management::Space).to receive(:find).with('foo').and_raise(::Contentful::Management::NotFound.new(ErrorRequestDouble.new))
+
+        expect { update_space_command.run }.to raise_error SystemExit
+      end
+
+      it 'exits if JSON template is not an existing file' do
+        expect(subject).to receive(:fetch_space) { space_double }
+
+        expect { subject.run }.to raise_error SystemExit
+      end
+
+      describe 'runs JSON Template without already processed elements' do
+        [true, false].each do |mark_processed|
+          it (mark_processed ? 'marks as processed after run' : 'doesnt modify input file after done') do
+            subject = described_class.new token, 'foo', 'bar', mark_processed, false
+
+            allow(::File).to receive(:exist?) { true }
+
+            mock_template = Object.new
+
+            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, false) { mock_template }
+
+            subject.run
+          end
+        end
+      end
+    end
+  end
+
+  describe 'attributes' do
+    it ':json_template' do
+      expect(subject.json_template).to eq 'bar'
+    end
+  end
+end

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

@@ -17,12 +17,20 @@ describe Contentful::Bootstrap::Templates::Base do
       expect(subject.assets).to eq []
     end
 
-    it '#run' do
-      ['content_types', 'assets', 'entries'].each do |name|
-        expect(subject).to receive("create_#{name}".to_sym)
+    describe '#run' do
+      it 'calls create for each kind of object' do
+        ['content_types', 'assets', 'entries'].each do |name|
+          expect(subject).to receive("create_#{name}".to_sym)
+        end
+
+        subject.run
       end
 
-      subject.run
+      it 'calls after_run when done' do
+        expect(subject).to receive(:after_run)
+
+        subject.run
+      end
     end
   end
 

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

@@ -2,9 +2,13 @@ require 'spec_helper'
 
 describe Contentful::Bootstrap::Templates::JsonTemplate do
   let(:space) { Contentful::Management::Space.new }
-  let(:path) { File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'simple.json')) }
+  let(:path) { json_path('simple') }
   subject { described_class.new space, path }
 
+  before do
+    allow(::File).to receive(:write)
+  end
+
   describe 'instance methods' do
     describe '#content_types' do
       it 'fetches content types' do
@@ -63,10 +67,10 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
   end
 
   describe 'template version check' do
-    let(:invalid_version_path) { File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'invalid.json')) }
-    let(:low_version_path) { File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'low.json')) }
-    let(:high_version_path) { File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'high.json')) }
-    let(:ok_version_path) { File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'ok_version.json')) }
+    let(:invalid_version_path) { json_path('invalid') }
+    let(:low_version_path) { json_path('low') }
+    let(:high_version_path) { json_path('high') }
+    let(:ok_version_path) { json_path('ok_version') }
 
     it 'rejects templates without version' do
       expect { described_class.new space, invalid_version_path }.to raise_error "JSON Templates Version Mismatch. Current Version: 3"
@@ -86,7 +90,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
   end
 
   describe 'issues' do
-    let(:link_entry_path) { File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'links.json')) }
+    let(:link_entry_path) { json_path('links') }
 
     it 'links are not properly getting processed - #33' do
       subject = described_class.new space, link_entry_path
@@ -99,4 +103,69 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
       )
     end
   end
+
+  describe 'bootstrap processed' do
+    let(:processed_path) { json_path('processed') }
+
+    it 'filters content types that were already processed' do
+      json_fixture('processed') { |json|
+        expect(json['contentTypes'].size).to eq(2)
+        expect(json['contentTypes'].last['id']).to eq('dog')
+
+        subject = described_class.new(space, processed_path, false, false)
+
+        expect(subject.content_types.size).to eq(1)
+        expect(subject.content_types.first['id']).to eq('cat')
+      }
+    end
+
+    it 'filters assets that were already processed' do
+      json_fixture('processed') { |json|
+        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)
+
+        expect(subject.assets.size).to eq(1)
+        expect(subject.assets.first['id']).to eq('cat_asset')
+      }
+    end
+
+    it 'filters entries that were already processed' do
+      json_fixture('processed') { |json|
+        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)
+
+        expect(subject.entries['dog'].size).to eq(0)
+      }
+    end
+  end
+
+  describe 'mark processed' do
+    it 'does not write file after run if not mark_processed' do
+      subject = described_class.new(space, path, false, false)
+      ['content_types', 'assets', 'entries'].each do |n|
+        allow(subject).to receive("create_#{n}".to_sym)
+      end
+
+      expect(subject).to receive(:after_run).and_call_original
+      expect(::File).not_to receive(:write)
+
+      subject.run
+    end
+
+    it 'writes file after run if mark_processed' do
+      subject = described_class.new(space, path, true, false)
+      ['content_types', 'assets', 'entries'].each do |n|
+        allow(subject).to receive("create_#{n}".to_sym)
+      end
+
+      expect(subject).to receive(:after_run).and_call_original
+      expect(::File).to receive(:write)
+
+      subject.run
+    end
+  end
 end

data/spec/fixtures/json_fixtures/processed.json

@@ -0,0 +1,72 @@
+{
+  "version": 3,
+  "contentTypes": [
+    {
+      "id": "cat",
+      "name": "Cat",
+      "displayField": "name",
+      "fields": [
+        {
+          "id": "name",
+          "name": "Name",
+          "type": "Symbol"
+        }
+      ]
+    },
+    {
+      "id": "dog",
+      "bootstrapProcessed": true,
+      "name": "Dog",
+      "displayField": "name",
+      "fields": [
+        {
+          "id": "name",
+          "name": "Name",
+          "type": "Symbol"
+        }
+      ]
+    }
+  ],
+  "assets": [
+    {
+      "id": "cat_asset",
+      "title": "Cat",
+      "file": {
+        "filename": "cat",
+        "url": "https://somecat.com/my_cat.jpeg"
+      }
+    },
+    {
+      "id": "dog_asset",
+      "bootstrapProcessed": true,
+      "title": "Dog",
+      "file": {
+        "filename": "Dog",
+        "url": "https://somedog.com/my_dog.jpeg"
+      }
+    }
+  ],
+  "entries": {
+    "cat": [
+      {
+        "sys": {
+          "id": "nyancat"
+        },
+        "fields": {
+          "name": "Nyan Cat"
+        }
+      }
+    ],
+    "dog": [
+      {
+        "sys": {
+          "id": "doge",
+          "bootstrapProcessed": true
+        },
+        "fields": {
+          "name": "Doge"
+        }
+      }
+    ]
+  }
+}

data/spec/spec_helper.rb

@@ -5,12 +5,16 @@ require 'vcr'
 require 'json'
 
 VCR.configure do |config|
-  config.cassette_library_dir = "spec/fixtures/vcr_fixtures"
+  config.cassette_library_dir = File.join('spec', 'fixtures', 'vcr_fixtures')
   config.hook_into :webmock
 end
 
+def json_path(name)
+  File.join('spec', 'fixtures', 'json_fixtures', "#{name}.json")
+end
+
 def json_fixture(name)
-  json = JSON.load(File.read("spec/fixtures/json_fixtures/#{name}.json"))
+  json = JSON.load(File.read(File.expand_path(json_path(name))))
   yield json if block_given?
   json
 end
@@ -42,6 +46,14 @@ class ServerDouble
   end
 end
 
+class ErrorRequestDouble
+  def request; self; end
+  def endpoint; self; end
+  def error_message; self; end
+  def raw; self; end
+  def body; self; end
+end
+
 class RequestDouble
   attr_accessor :query
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful_bootstrap
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - David Litvak Bruno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -221,6 +221,7 @@ files:
 - lib/contentful/bootstrap/commands/create_space.rb
 - lib/contentful/bootstrap/commands/generate_json.rb
 - lib/contentful/bootstrap/commands/generate_token.rb
+- lib/contentful/bootstrap/commands/update_space.rb
 - lib/contentful/bootstrap/constants.rb
 - lib/contentful/bootstrap/generator.rb
 - lib/contentful/bootstrap/management.rb
@@ -243,6 +244,7 @@ files:
 - spec/contentful/bootstrap/commands/create_space_spec.rb
 - spec/contentful/bootstrap/commands/generate_json_spec.rb
 - spec/contentful/bootstrap/commands/generate_token_spec.rb
+- spec/contentful/bootstrap/commands/update_space_spec.rb
 - spec/contentful/bootstrap/generator_spec.rb
 - spec/contentful/bootstrap/management_spec.rb
 - spec/contentful/bootstrap/server_spec.rb
@@ -268,6 +270,7 @@ files:
 - spec/fixtures/json_fixtures/low.json
 - spec/fixtures/json_fixtures/no_ids.json
 - spec/fixtures/json_fixtures/ok_version.json
+- spec/fixtures/json_fixtures/processed.json
 - spec/fixtures/json_fixtures/simple.json
 - spec/fixtures/json_fixtures/wl1z0pal05vy.json
 - spec/fixtures/vcr_fixtures/create_space.yml
@@ -309,6 +312,7 @@ test_files:
 - spec/contentful/bootstrap/commands/create_space_spec.rb
 - spec/contentful/bootstrap/commands/generate_json_spec.rb
 - spec/contentful/bootstrap/commands/generate_token_spec.rb
+- spec/contentful/bootstrap/commands/update_space_spec.rb
 - spec/contentful/bootstrap/generator_spec.rb
 - spec/contentful/bootstrap/management_spec.rb
 - spec/contentful/bootstrap/server_spec.rb
@@ -334,6 +338,7 @@ test_files:
 - spec/fixtures/json_fixtures/low.json
 - spec/fixtures/json_fixtures/no_ids.json
 - spec/fixtures/json_fixtures/ok_version.json
+- spec/fixtures/json_fixtures/processed.json
 - spec/fixtures/json_fixtures/simple.json
 - spec/fixtures/json_fixtures/wl1z0pal05vy.json
 - spec/fixtures/vcr_fixtures/create_space.yml