contentful-importer 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa4629a62ce75efb874ec258ca97b52e0c4445b
-  data.tar.gz: c19dcf768739ab8d598e308321656e603e003cab
+  metadata.gz: 569b9ef01dc69598930b6340c14621c2a078f6d7
+  data.tar.gz: 71ad10863d5045c601823a4b3a369dd66d397e6c
 SHA512:
-  metadata.gz: bf23dffc641289aee7933ee6b81d31cdfe2fb42731a97a20fea615fcd16ef37b3c79e60692ce7d3aca88f0c494c64814b5d71f576dc1778712a6bb93c7b6b8a7
-  data.tar.gz: 31f1f0dacef1a50f1afc4b7d44793d5d939071fd2e4c7a9537891b161161aacd8b7d987123a26fb8254b9c6e4ef967c3a83631b1156545d74ebbcc76e92b6c00
+  metadata.gz: e6448daef3961d265952d7b297b04c974b9deaba953982165a4006ffdbd9e105c65b7e56414748c2155fe2ab077c63374e212e5ed369dac1574134dafeea9f5c
+  data.tar.gz: 6205fff19db2ce9764517bfcdf93fa8122bb3ab21db6b04cf8420beb5fb7ec6f03038f076bb1a4a36128ca8c56657b34b556466ddfe9360b9ddd5ce508c1f491

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.2.0
+### Added
+* Import validations for content types
+* Update contentful-management.rb dependency to 0.0.7 [#18]
+* Revised cli interface [#17]
+
 ## 0.1.1
 ### Added
 * Log asset errors similar to entry import errors

data/Gemfile.lock

@@ -4,8 +4,8 @@ PATH
     contentful-importer (0.1.0)
       activesupport (~> 4.1)
       api_cache (~> 0.3.0)
+      claide (~> 0.8.1)
       contentful-management (~> 0.5.0)
-      escort (~> 0.4.0)
       http (~> 0.6)
       i18n (~> 0.6)
       json-schema (~> 2.5.0)
@@ -22,6 +22,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.6)
     api_cache (0.3.0)
+    claide (0.8.1)
     contentful-management (0.5.0)
       http (~> 0.6)
       multi_json (~> 1)
@@ -29,8 +30,6 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    escort (0.4.0)
-      nesty
     http (0.7.3)
       http-form_data (~> 1.0.0)
       http_parser.rb (~> 0.6.0)
@@ -42,7 +41,6 @@ GEM
       addressable (~> 2.3)
     minitest (5.5.1)
     multi_json (1.10.1)
-    nesty (1.0.2)
     rake (10.4.2)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)

data/README.md

@@ -32,17 +32,19 @@ As a first step you should create a `settings.yml` file and fill in your credent
 ```yaml
 #Contentful
 access_token: access_token
-organization_od: organization_id
+organization_id: organization_id
 ```
 
+Alternatively, you can also specify those options on the commandline.
+
 **A Contentful OAuth access token can be created using the [Contentful Management API - documentation](https://www.contentful.com/developers/documentation/content-management-api/#getting-started)**
 
-The Contentful organization id can be found in your account settings.
+The Contentful organization ID can be found in your account settings, but you will only need to specify it if you are member of more than one organization.
 
 Once you installed the Gem and created the YAML file with the settings you can invoke the tool using:
 
 ```bash
-contentful-importer --config-file settings.yml --action
+contentful-importer --configuration=settings.yml ACTION
 ```
 
 ## Step by step
@@ -53,21 +55,17 @@ contentful-importer --config-file settings.yml --action
     #PATH to all data
     data_dir: DEFINE_BEFORE_EXPORTING_DATA
 
+    #JSON describing your content model
+    content_model_json: PATH_TO_CONTENTFUL_MODEL_JSON_FILE
+
     #Contentful credentials
     access_token: ACCESS_TOKEN
     organization_id: ORGANIZATION_ID
     space_id: DEFINE_AFTER_CREATING_SPACE
     default_locale: DEFINE_LOCALE_CODE
-
-    ## CONTENTFUL STRUCTURE
-    contentful_structure_dir: PATH_TO_CONTENTFUL_STRUCTURE_JSON_FILE
-
-    ## CONVERT CONTENTFUL MODEL TO CONTENTFUL IMPORT STRUCTURE
-    content_model_json: PATH_TO_CONTENTFUL_MODEL_JSON_FILE ## for input
-    converted_model_dir: PATH_TO_CONTENTFUL_MODEL_JSON_FILE ## for output
     ```
 
-2. Create the contentful_structure.json. First you need to create a content model using the [Contentful web application](www.contentful.com). Then you can download the content model using the content management api and use the content model for the import:
+2. First you need to create a content model using the [Contentful web application](www.contentful.com). Then you can download the content model using the content management api and use the content model for the import:
 
     ```bash
      curl -X GET \
@@ -75,58 +73,50 @@ contentful-importer --config-file settings.yml --action
           'https://api.contentful.com/spaces/SPACE_ID/content_types' > contentful_model.json
     ```
 
-    It will create ```contentful_model.json``` file, which you need to transform into the ```contentful_structure.json``` using:
-
-    ```bash
-    contentful-importer --config-file settings.yml --convert-content-model-to-json
-    ```
-
-    The converted content model will be saved as JSON file in the ```converted_model_dir``` path.
+    It will create ```contentful_model.json``` file, which you can pass to the tool via the `content_model_json` option. If you are using one of our exporter tools, this will not be necessary.
 
 
 3. Once you have prepared the `content types`, `assets` and `entries` (for example using one of the existing extraction adapters or creating your own) they can be imported. It can be chosen to use one (default) or two parallel threads to speedup this process.
-   There are two steps to import entries and assets.
 
-    **Entries**
+    It is possible to import the everything in one step using the `import` action or to import content model, entries or assets individually:
 
     ```bash
-    contentful-importer --config-file settings.yml --import
+    contentful-importer --configuration=settings.yml import --threads=2
+    contentful-importer --configuration=settings.yml import-content-model
+    contentful-importer --configuration=settings.yml import-entries
+    contentful-importer --configuration=settings.yml import-assets
     ```
 
-    or
+    Optionally, two threads can be used for the import.
 
-    ```bash
-    contentful-importer --config-file settings.yml --import --threads 2
-    ```
+    After each request the `success_thread_{0,1}.csv` or `success_assets.csv` file is updated. You can find those in `$data_dir/logs`.
+    If an entry or asset fails to be imported, it will end up in the `failure_thread_{0,1}.csv` or `failure_assets.csv` including the error message.
 
-    **Assets**
 
-    ```bash
-    contentful-importer --config-file settings.yml --import-assets
-    ```
-
-    After each request the `success_number_of_thread.csv` or `success_assets.csv` file is updated. You can find those in `data_dir/logs`.
-    If an entry or asset fails to be imported, it will end up in the `failure_number_of_thread.csv` or `assets_failure.csv` including the error message.
+4. Publish entries and assets. After successfully importing the entries and assets to contentful, they need to be published in order to be available through the delivery API.
 
+    To publish everything that has been imported:
 
-4. Publish entries and assets. After successfully importing the entries and assets to contentful, they need to be published in order to be available through the delivery API.
+    ```bash
+    contentful-importer --configuration=settings.yml publish
+    ```
 
     To publish all entries use:
 
     ```bash
-    contentful-importer --config-file settings.yml --publish-entries
+    contentful-importer --configuration=settings.yml publish-entries
     ```
 
     To publish all assets use:
 
     ```bash
-    contentful-importer --config-file settings.yml --publish-assets
+    contentful-importer --configuration=settings.yml publish-assets
     ```
 
     or
 
     ```bash
-    contentful-importer --config-file settings.yml --publish-assets --threads 2
+    contentful-importer --configuration=settings.yml publish-assets --threads=2
     ```
 
     After each request the ```success_published_entries.csv``` or ```success_published_assets.csv``` file is updated. You can find those in ```data_dir/logs```.
@@ -135,108 +125,10 @@ contentful-importer --config-file settings.yml --action
 
 ## Actions
 
-To display all actions use the `-h` option:
-
-```bash
-contentful-importer -h
-```
-
-#### --convert-content-model-to-json
-
-If you already have an existing content model for a space it can be downloaded and used for the import:
-
-```bash
- curl -X GET \
-      -H 'Authorization: Bearer ACCESS_TOKEN' \
-      'https://api.contentful.com/spaces/SPACE_ID/content_types' > contentful_model.json
-```
-
-In the **settings.yml** specify the PATH to **contentful_model.json**.
-
-```yaml
-#Dump file with content model.
-content_model_json: example_path/contentful_model.json
-```
-
-and define the PATH where you want to save the converted JSON file:
-
-```yaml
-#File with converted structure of contentful model. Almost ready to import.
-converted_model_dir: example_path/contentful_structure.json
-```
-
-#### --create-contentful-model-from-json
-
-Create the content model based on the structure defined in ```contentful_structure.json```.
-This will generate content types files that are ready to be imported.
-Set the `contentful_structure_dir` variable to point to the structure file in your settings file.
-
-Path to collections: **data_dir/collections**
-
-```bash
-contentful-importer --config-file settings.yml --create-contentful-model-from-json
-```
-
-This is optional if you intend to create your own content structure as JSON files and not use the web application for it.
-
-#### --import-content-types ARGS
-
-To import the content types into an existing space use `--space_id SPACE_ID`:
-
-```bash
-contentful-importer --config-file settings.yml --import-content-types --space_id SPACE_ID
-```
-
-To create a new Space and import content types use `--space_name NAME`:
-
-```bash
-contentful-importer --config-file settings.yml --import-content-types --space_name NAME
-```
-
-#### --import
-
-Import the entries with a single thread:
-
-```bash
-contentful-importer --config-file settings.yml --import
-```
-
-or using two threads
-
-```bash
-contentful-importer --config-file settings.yml --import --threads 2
-```
-
-#### --import-assets
-
-Import the assets:
-
-```bash
-contentful-importer --config-file settings.yml --import-assets
-```
-
-#### --publish-entries
-
-To publish all entries:
-
-```bash
-contentful-importer --config-file settings.yml --publish-entries
-```
-
-Number of threads that are used in the publishing of entries is dependent on `--threads` argument, which you specified when import data.
-
-#### --publish-assets ARGS
-
-You can publish all assets with single Thread:
-
-```bash
-contentful-importer --config-file settings.yml --publish-assets
-```
-
-or add ```--threads``` argument to use multiple Threads:
+To display all actions use the `--help` option:
 
 ```bash
-contentful-importer --config-file settings.yml --publish-assets --threads 2
+contentful-importer --help
 ```
 
 #### --test-credentials
@@ -244,14 +136,14 @@ contentful-importer --config-file settings.yml --publish-assets --threads 2
 Before importing any content you can verify that your credentials in the **settings.yml** file are correct:
 
 ```bash
-contentful-importer --config-file settings.yml --test-credentials
+contentful-importer --configuration=settings.yml test-credentials
 ```
 
 #### --validate-schema
 
 After preparing the files to import, you can validate the JSON schema, use command:
 
-```contentful-importer --config-file settings.yml --validate-schema```
+```contentful-importer --configuration=settings.yml validate-schema```
 
 This comes in handy when you want to create your own extraction adapter.
 
@@ -312,7 +204,7 @@ Before you start importing the content make sure you read [how to use it](https:
 
 #### Space ID
 
-After [importing the content types](https://github.com/contentful/generic-importer.rb#--import-content-types-args) to the Space, you need to specify the `space_id` parameter in the settings. Please note that the content-type import only accepts the space ID as a commandline option.
+After [importing the content types](https://github.com/contentful/generic-importer.rb#--import-content-types-args) to the Space, you need to specify the `space_id` parameter in the settings.
 
 
 Example:

data/bin/contentful-importer

@@ -1,85 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'escort'
-require_relative '../lib/contentful/importer/cli'
-
-fail ArgumentError, 'Set the path to the configuration file and define an action. More information can be found in the README.' if ARGF.argv.empty?
-fail ArgumentError, "Missing '--config-file' argument. Usage: 'contentful-importer --config-file PATH_TO_CONFIGURATION_FILE --action'." unless ARGV.include?('--config-file')
-
-Escort::App.create do |app|
-  app.summary 'Executable file of Generic-importer Gem'
-
-  app.options do |opts|
-    opts.opt :file, '--config-file', short: '-f', long: '--config-file', type: :string
-
-    app.command '--create-contentful-model-from-json' do |command|
-      command.summary 'Create content types json files, based on contentful_structure.json file.'
-      command.action do |options, arguments|
-        Contentful::Importer::CLI.new(options, arguments).execute
-      end
-    end
-    app.command '--convert-content-model-to-json' do |command|
-      command.summary 'Transform contentful model to contentful structure ready to import. View README'
-      command.action do |options, arguments|
-        Contentful::Importer::CLI.new(options, arguments).execute
-      end
-    end
-    app.command '--import-content-types' do |command|
-      command.summary 'Find an existing Space or create new one. Import content types to Contentful platform'
-      command.requires_arguments false
-      command.options do |opts|
-        opts.opt :space_id, 'space_id', short: '-s', long: '--space_id', type: :string
-        opts.opt :space_name, 'space_name', short: :none, long: '--space_name', type: :string
-      end
-      command.action do |options, arguments|
-        Contentful::Importer::CLI.new(options, arguments).execute
-      end
-    end
-    app.command '--import' do |command|
-      command.summary 'Import entries to Contentful platform'
-      command.options do |opts|
-        opts.opt :threads, 'threads', short: '-t', long: '--threads', type: :integer, default: 1
-        opts.validate(:threads, 'argument must be set to 1 or 2 exclusive. ') { |option| option > 0 && option <= 2 }
-      end
-      command.action do |options, arguments|
-        Contentful::Importer::CLI.new(options, arguments).execute
-      end
-    end
-    app.command '--test-credentials' do |command|
-      command.summary 'Check your Contentful-management credentials'
-      command.action do |options, arguments|
-        Contentful::Importer::CLI.new(options, arguments).execute
-      end
-    end
-    app.command '--import-assets' do |command|
-      command.summary 'Import only assets'
-      command.action do |options, arguments|
-        Contentful::Importer::CLI.new(options, arguments).execute
-      end
-    end
+if $PROGRAM_NAME == __FILE__
+  ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
+  require 'rubygems'
+  require 'bundler/setup'
+  $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+end
 
-    app.command '--publish-entries' do |command|
-      command.summary 'Publish all entries'
-      command.action do |options, arguments|
-        Contentful::Importer::CLI.new(options, arguments).execute
-      end
-    end
+require 'contentful/importer/command'
 
-    app.command '--publish-assets' do |command|
-      command.summary 'Publish all assets'
-      command.options do |opts|
-        opts.opt :threads, 'threads', short: '-t', long: '--threads', type: :integer, default: 1
-        opts.validate(:threads, 'argument must be set to 1 or 2 exclusive. ') { |option| option > 0 && option <= 2 }
-      end
-      command.action do |options, arguments|
-        Contentful::Importer::CLI.new(options, arguments).execute
-      end
-    end
-    app.command '--validate-schema' do |command|
-      command.summary 'Validate entries JSON schema'
-      command.action do |options, arguments|
-        Contentful::Importer::CLI.new(options, arguments).execute
-      end
-    end
-  end
-end
+Contentful::Importer::Command.run(ARGV)

data/contentful_importer.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'http', '~> 0.6'
+  spec.add_dependency 'http', '~> 0.8'
   spec.add_dependency 'multi_json', '~> 1'
-  spec.add_dependency 'contentful-management', '~> 0.5.0'
+  spec.add_dependency 'contentful-management', '~> 0.7.0'
   spec.add_dependency 'activesupport','~> 4.1'
-  spec.add_dependency 'escort','~> 0.4.0'
+  spec.add_dependency 'claide','~> 0.8.1'
   spec.add_dependency 'api_cache', ' ~> 0.3.0'
   spec.add_dependency 'i18n', '~> 0.6'
   spec.add_dependency 'json-schema', '~> 2.5.0'

data/lib/contentful/importer/command.rb

@@ -0,0 +1,87 @@
+require 'claide'
+require 'yaml'
+
+require_relative 'parallel_importer'
+require_relative 'configuration'
+require_relative 'converters/contentful_model_to_json'
+require_relative 'json_schema_validator'
+
+module Contentful
+	module Importer
+		class PlainInformative < StandardError
+			include CLAide::InformativeError
+		end
+
+		class Informative < PlainInformative
+			def message
+				"[!] #{super}".red
+			end
+		end
+
+		class Command < CLAide::Command
+			require_relative 'import'
+			require_relative 'import_assets'
+			require_relative 'import_entries'
+			require_relative 'import_model'
+			require_relative 'publish'
+			require_relative 'publish_assets'
+			require_relative 'publish_entries'
+			require_relative 'test_credentials'
+
+			attr_reader :importer, :converter, :config, :json_validator
+
+			self.abstract_command = true
+			self.command = 'contentful-importer'
+			self.version = VERSION
+			self.description = 'Import structured JSON data to Contentful.'
+
+			def self.options
+				[['--configuration=config.yaml', 'Use the given configuration file.'],
+				 ['--access_token=XXX', 'The CMA access token to be used.']].concat(super).sort
+			end
+
+			def self.data_options
+				[['--data_dir=data', 'The directory to use for input, temporary data and logs.']]
+			end
+
+			def self.space_options
+				[['--organization_id=YYY', 'Select organization if you are member of more than one.'],
+				 ['--space_id=ZZZ', 'Import into an existing space.'],
+				 ['--space_name=ZZZ', 'Import into a new space with the given name.'],
+				 ['--default_locale=de-DE', 'Locale to use if a new space is being created.']]
+			end
+
+			def self.thread_options
+				[['--threads=1', 'Number of threads to be used, can be either 1 or 2.']]
+			end
+
+			def initialize(args)
+				super(args)
+
+				@settings = {}
+
+				settings_file = args.option('configuration')
+				@settings.merge!(YAML.load_file(settings_file)) if settings_file
+
+				# CLI options can override settings of the same name
+				self.class.options.map { |opt| opt.first.split('=').first.split('-').last }.each do |opt|
+					arg = args.option(opt)
+					arg = arg.to_i if opt == 'threads'
+					@settings[opt] = arg if arg
+				end
+
+				@settings = @settings.with_indifferent_access
+				@settings[:threads] = 1 if @settings[:threads].nil?
+			end
+
+			def run
+				@config = Configuration.new(@settings)
+				@importer = ParallelImporter.new(@config)
+				@converter = ContentfulModelToJson.new(@config)
+				@json_validator = JsonSchemaValidator.new(@config)
+
+				json_validator.validate_schemas
+			end
+		end
+	end
+end

data/lib/contentful/importer/import.rb

@@ -0,0 +1,24 @@
+module Contentful
+	module Importer
+		class Import < Command
+			require_relative 'import_assets'
+			require_relative 'import_entries'
+			require_relative 'import_model'
+
+			self.command = 'import'
+			self.summary = 'Import content model, entries and assets.'
+
+			def self.options
+				ImportModel.options.concat(ImportEntries.options).concat(ImportAssets.options).uniq.sort
+			end
+
+			def run
+				super
+
+				ImportModel.import(@settings, @converter, @importer)
+				ImportEntries.import(@settings, @importer)
+				ImportAssets.import(@importer)
+			end
+		end
+	end
+end

data/lib/contentful/importer/import_assets.rb

@@ -0,0 +1,23 @@
+require_relative 'command'
+
+module Contentful
+	module Importer
+		class ImportAssets < Command
+			self.command = 'import-assets'
+			self.summary = 'Import assets.'
+
+			def self.options
+				super.concat(data_options).sort
+			end
+
+			def self.import(importer)
+				importer.import_only_assets
+			end
+
+			def run
+				super
+				self.class.import(@importer)
+			end
+		end
+	end
+end

data/lib/contentful/importer/import_entries.rb

@@ -0,0 +1,23 @@
+require_relative 'command'
+
+module Contentful
+	module Importer
+		class ImportEntries < Command
+			self.command = 'import-entries'
+			self.summary = 'Import entries.'
+
+			def self.options
+				super.concat(data_options).concat(space_options).concat(thread_options).sort
+			end
+
+			def self.import(settings, importer)
+				importer.import_data(settings[:threads])
+			end
+
+			def run
+				super
+				self.class.import(@settings, @importer)
+			end
+		end
+	end
+end

data/lib/contentful/importer/import_model.rb

@@ -0,0 +1,30 @@
+require_relative 'command'
+
+module Contentful
+	module Importer
+		class ImportModel < Command
+			self.command = 'import-content-model'
+			self.summary = 'Import the content model.'
+
+			def self.options
+				[['--content_model_json=model.json',
+					'Content model to use for import. Uses the data directory by default.']
+					].concat(super).concat(data_options).concat(space_options).sort
+			end
+
+			def self.import(settings, converter, importer)
+				if settings['content_model_json']
+					converter.convert_to_import_form
+					converter.create_content_type_json
+				end
+
+				importer.create_contentful_model(settings)
+			end
+
+			def run
+				super
+				self.class.import(@settings, @converter, @importer)
+			end
+		end
+	end
+end

data/lib/contentful/importer/parallel_importer.rb

@@ -195,8 +195,8 @@ module Contentful
           collection_attributes = JSON.parse(File.read(file_path))
           content_type = create_new_content_type(space, collection_attributes)
           logger.info "Importing content_type: #{content_type.name}"
+          content_type.properties[:displayField] = collection_attributes['displayField'] or ""
           create_content_type_fields(collection_attributes, content_type)
-          content_type.update(displayField: collection_attributes['displayField']) if collection_attributes['displayField']
           active_status(content_type.activate)
         end
       end
@@ -317,6 +317,9 @@ module Contentful
       def create_field(field)
         field_params = {id: field['id'], name: field['name'], required: field['required']}
         field_params.merge!(additional_field_params(field))
+        if field['validations']
+          field_params[:validations] = create_validations(field['validations'])
+        end
         logger.info "Creating field: #{field_params[:type]}"
         create_content_type_field(field_params)
       end
@@ -329,7 +332,27 @@ module Contentful
           field.link_type = field_params[:link_type]
           field.required = field_params[:required]
           field.items = field_params[:items]
+          field.validations = field_params[:validations] if field_params[:validations]
+        end
+      end
+
+      def create_validations(validations_params)
+        validations = validations_params.each_with_object([]) do |validation_params, validations|
+          validations << create_validation(validation_params)
         end
+        return validations
+      end
+
+      def create_validation(validation_params)
+        validation = Contentful::Management::Validation.new
+
+        mappings = {'linkContentType' => 'link_content_type'}
+        type = validation_params['type']
+        type = mappings[type] if mappings[type]
+
+        params = validation_params['params']
+        validation.send("#{type}=", params)
+        return validation
       end
 
       def active_status(ct_object)

data/lib/contentful/importer/publish.rb

@@ -0,0 +1,21 @@
+module Contentful
+	module Importer
+		class Publish < Command
+			require_relative 'publish_assets'
+			require_relative 'publish_entries'
+
+			self.command = 'publish'
+			self.summary = 'Publish entries and assets.'
+
+			def self.options
+				PublishAssets.options.concat(PublishEntries.options).uniq.sort
+			end
+
+			def run
+				super
+				PublishAssets.publish(@settings, @importer)
+				PublishEntries.publish(@importer)
+			end
+		end
+	end
+end

data/lib/contentful/importer/publish_assets.rb

@@ -0,0 +1,23 @@
+require_relative 'command'
+
+module Contentful
+	module Importer
+		class PublishAssets < Command
+			self.command = 'publish-assets'
+			self.summary = 'Publish assets.'
+
+			def self.options
+				super.concat(data_options).concat(thread_options).sort
+			end
+
+			def self.publish(settings, importer)
+				importer.publish_assets_in_threads(settings[:threads])
+			end
+
+			def run
+				super
+				self.class.publish(@settings, @importer)
+			end
+		end
+	end
+end

data/lib/contentful/importer/publish_entries.rb

@@ -0,0 +1,23 @@
+require_relative 'command'
+
+module Contentful
+	module Importer
+		class PublishEntries < Command
+			self.command = 'publish-entries'
+			self.summary = 'Publish entries.'
+
+			def self.options
+				super.concat(data_options).sort
+			end
+
+			def self.publish(importer)
+				importer.publish_entries_in_threads
+			end
+
+			def run
+				super
+				self.class.publish(@importer)
+			end
+		end
+	end
+end

data/lib/contentful/importer/test_credentials.rb

@@ -0,0 +1,17 @@
+module Contentful
+	module Importer
+		class TestCredentials < Command
+			self.command = 'test-credentials'
+			self.summary = 'Test given credentials against the server.'
+
+			def self.options
+				super.concat(space_options).sort
+			end
+
+			def run
+				super
+				importer.test_credentials
+			end
+		end
+	end
+end

data/lib/contentful/importer/version.rb

@@ -1,5 +1,5 @@
 module Contentful
 	module Importer
-  		VERSION = '0.1.1'
+  		VERSION = '0.2.0'
   	end
 end

data/spec/lib/import_assets_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require './lib/contentful/importer/import_assets'
+
+module Contentful
+  module Importer
+    describe ImportAssets do
+      before do
+        setting_file = 'spec/fixtures/settings/settings.yml'
+        @args = ["--configuration=#{setting_file}"]
+      end
+
+      it 'import an assets to Contentful' do
+        vcr('import_assets') do
+          command = ImportAssets.parse(@args << 'import-assets')
+          command.run
+        end
+      end
+    end
+  end
+end

data/spec/lib/import_entries_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require './lib/contentful/importer/import_entries'
+
+module Contentful
+  module Importer
+    describe ImportEntries do
+      before do
+        setting_file = 'spec/fixtures/settings/settings.yml'
+        @args = ["--configuration=#{setting_file}"]
+      end
+
+      it 'import an entires to Contentful with two Threads' do
+        vcr('import_entries') do
+          allow(FileUtils).to receive(:rm_r)
+          command = ImportEntries.parse(@args + ['import-entries', '--threads=2'])
+          import = command.run
+          expect(import).to be_a Array
+          expect(import.count).to eq 2
+        end
+      end
+    end
+  end
+end

data/spec/lib/{migrator_spec.rb → import_model_spec.rb}

@@ -1,14 +1,20 @@
 require 'spec_helper'
-require './lib/contentful/importer/migrator'
+require './lib/contentful/importer/import_model'
 
 module Contentful
   module Importer
-    describe Migrator do
+    describe ImportModel do
       before do
-        @setting_file = YAML.load_file('spec/fixtures/settings/settings.yml')
+        setting_file = 'spec/fixtures/settings/settings.yml'
+        @args = ["--configuration=#{setting_file}"]
       end
+      
       it 'convert contentful model to contentful structure' do
-        Migrator.new(@setting_file).run('--convert-content-model-to-json')
+        allow_any_instance_of(ParallelImporter).to receive(:create_contentful_model)
+
+        command = ImportModel.parse(@args << 'import-content-model')
+        command.run
+
         contentful_structure = load_fixture('settings/contentful_structure_test')
         expect(contentful_structure.count).to eq 4
         expect(contentful_structure['Jobs']).to include(id: '4L1bg4WQ5aWQMiE82ouag', name: 'Jobs', displayField: 'title', description: nil)
@@ -18,7 +24,11 @@ module Contentful
       end
 
       it 'create content type json files from contentful structure' do
-        Migrator.new(@setting_file).run('--create-contentful-model-from-json')
+        allow_any_instance_of(ParallelImporter).to receive(:create_contentful_model)
+
+        command = ImportModel.parse(@args << 'import-content-model')
+        command.run
+
         expect(Dir.glob('spec/fixtures/import_files/collections/*').count).to eq 4
         content_types_files = %w(comment.json job_skills.json jobs.json profile.json user.json)
         Dir.glob('spec/fixtures/import_files/collections/*') do |directory_name|
@@ -46,58 +56,17 @@ module Contentful
 
       it 'create content type json files from contentful structure' do
         vcr('import_content_types') do
-          Migrator.new(@setting_file).run('--import-content-types', space_id: 'space_id')
-        end
-      end
-
-      it 'import an entires to Contentful with two Threads' do
-        vcr('import_entries') do
-          allow(FileUtils).to receive(:rm_r)
-          import = Migrator.new(@setting_file).run('--import', threads: 2)
-          expect(import).to be_a Array
-          expect(import.count).to eq 2
-        end
-      end
-
-      it 'import an assets to Contentful' do
-        vcr('import_assets') do
-          Migrator.new(@setting_file).run('--import-assets')
-        end
-      end
-
-      it 'publish an entires' do
-        vcr('publish_entries') do
-          Migrator.new(@setting_file).run('--publish-entries')
-        end
-      end
-
-      it 'publish an assets' do
-        vcr('publish_asset') do
-          expect_any_instance_of(ParallelImporter).to receive(:publish_status).exactly(4).times
-          expect_any_instance_of(ParallelImporter).to receive(:create_log_file).with('success_published_assets')
-          Migrator.new(@setting_file).run('--publish-assets', threads: 1)
-        end
-      end
-
-      context 'test credentials' do
-        it 'when valid' do
-          vcr('valid_credentials') do
-            expect_any_instance_of(Logger).to receive(:info).with('Contentful Management API credentials: OK')
-            Migrator.new(@setting_file).run('--test-credentials')
-          end
-        end
-        it 'when invalid' do
-          vcr('invalid_credentials') do
-            expect_any_instance_of(Logger).to receive(:info).with('Contentful Management API credentials: INVALID (check README)')
-            Migrator.new(@setting_file).run('--test-credentials')
-          end
+          command = ImportModel.parse(@args + ['import-content-model', '--space_id=space_id'])
+          command.run
         end
       end
 
       it 'validate JSON schema' do
-        expect { Migrator.new(@setting_file).run('--validate-schema') }.not_to raise_error
+        allow_any_instance_of(ParallelImporter).to receive(:create_contentful_model)
+        
+        command = ImportModel.parse(@args << 'import-content-model')
+        expect { command.run }.not_to raise_error
       end
-
     end
   end
-end
+end

data/spec/lib/publish_assets_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require './lib/contentful/importer/publish_assets'
+
+module Contentful
+  module Importer
+    describe PublishAssets do
+      before do
+        setting_file = 'spec/fixtures/settings/settings.yml'
+        @args = ["--configuration=#{setting_file}"]
+      end
+
+      it 'publish an assets' do
+        vcr('publish_asset') do
+          expect_any_instance_of(ParallelImporter).to receive(:publish_status).exactly(4).times
+          expect_any_instance_of(ParallelImporter).to receive(:create_log_file).with('success_published_assets')
+          
+          command = PublishAssets.parse(@args + ['publish-assets', '--threads=1'])
+          command.run
+        end
+      end
+    end
+  end
+end

data/spec/lib/publish_entries_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require './lib/contentful/importer/publish_entries'
+
+module Contentful
+  module Importer
+    describe ImportModel do
+      before do
+        setting_file = 'spec/fixtures/settings/settings.yml'
+        @args = ["--configuration=#{setting_file}"]
+      end
+
+      it 'publish an entires' do
+        vcr('publish_entries') do
+          command = PublishEntries.parse(@args << 'publish-entries')
+          command.run
+        end
+      end
+    end
+  end
+end

data/spec/lib/test_credentials_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+require './lib/contentful/importer/test_credentials'
+
+module Contentful
+  module Importer
+    describe TestCredentials do
+      before do
+        setting_file = 'spec/fixtures/settings/settings.yml'
+        @args = ["--configuration=#{setting_file}", 'test-credentials']
+      end
+
+      it 'when valid' do
+        vcr('valid_credentials') do
+          expect_any_instance_of(Logger).to receive(:info).with('Contentful Management API credentials: OK')
+          TestCredentials.parse(@args).run
+        end
+      end
+
+      it 'when invalid' do
+        vcr('invalid_credentials') do
+          expect_any_instance_of(Logger).to receive(:info).with('Contentful Management API credentials: INVALID (check README)')
+          TestCredentials.parse(@args).run
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful-importer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Contentful GmbH (Andreas Tiefenthaler)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: escort
+  name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: api_cache
   requirement: !ruby/object:Gem::Requirement
@@ -229,15 +229,22 @@ files:
 - example_settings/contentful_structure.json
 - example_settings/files_meaning.txt
 - example_settings/settings.yml
-- lib/contentful/importer/cli.rb
+- lib/contentful/importer/command.rb
 - lib/contentful/importer/configuration.rb
 - lib/contentful/importer/converters/content_types_structure_creator.rb
 - lib/contentful/importer/converters/contentful_model_to_json.rb
 - lib/contentful/importer/data_organizer.rb
+- lib/contentful/importer/import.rb
+- lib/contentful/importer/import_assets.rb
+- lib/contentful/importer/import_entries.rb
+- lib/contentful/importer/import_model.rb
 - lib/contentful/importer/json_schema_validator.rb
-- lib/contentful/importer/migrator.rb
 - lib/contentful/importer/mime_content_type.rb
 - lib/contentful/importer/parallel_importer.rb
+- lib/contentful/importer/publish.rb
+- lib/contentful/importer/publish_assets.rb
+- lib/contentful/importer/publish_entries.rb
+- lib/contentful/importer/test_credentials.rb
 - lib/contentful/importer/version.rb
 - spec/fixtures/import_files/assets/image/image_1.json
 - spec/fixtures/import_files/assets/image/image_2.json
@@ -317,9 +324,14 @@ files:
 - spec/fixtures/vcr_cassettes/publish_entries.yml
 - spec/fixtures/vcr_cassettes/valid_credentials.yml
 - spec/lib/configuration_spec.rb
+- spec/lib/import_assets_spec.rb
+- spec/lib/import_entries_spec.rb
+- spec/lib/import_model_spec.rb
 - spec/lib/importer/parallel_importer_spec.rb
 - spec/lib/json_schema_validator_spec.rb
-- spec/lib/migrator_spec.rb
+- spec/lib/publish_assets_spec.rb
+- spec/lib/publish_entries_spec.rb
+- spec/lib/test_credentials_spec.rb
 - spec/spec_helper.rb
 - spec/support/db_rows_json.rb
 - spec/support/shared_configuration.rb
@@ -427,9 +439,14 @@ test_files:
 - spec/fixtures/vcr_cassettes/publish_entries.yml
 - spec/fixtures/vcr_cassettes/valid_credentials.yml
 - spec/lib/configuration_spec.rb
+- spec/lib/import_assets_spec.rb
+- spec/lib/import_entries_spec.rb
+- spec/lib/import_model_spec.rb
 - spec/lib/importer/parallel_importer_spec.rb
 - spec/lib/json_schema_validator_spec.rb
-- spec/lib/migrator_spec.rb
+- spec/lib/publish_assets_spec.rb
+- spec/lib/publish_entries_spec.rb
+- spec/lib/test_credentials_spec.rb
 - spec/spec_helper.rb
 - spec/support/db_rows_json.rb
 - spec/support/shared_configuration.rb

data/lib/contentful/importer/cli.rb

@@ -1,15 +0,0 @@
-require_relative 'migrator'
-require 'yaml'
-
-module Contentful
-	module Importer
-	  class CLI < Escort::ActionCommand::Base
-
-	    def execute
-	      setting_file = YAML.load_file(global_options[:file])
-	      Migrator.new(setting_file).run(command_name, command_options)
-	    end
-
-	  end
-	end
-end

data/lib/contentful/importer/migrator.rb

@@ -1,43 +0,0 @@
-require_relative 'parallel_importer'
-require_relative 'configuration'
-require_relative 'converters/contentful_model_to_json'
-require_relative 'json_schema_validator'
-
-module Contentful
-  module Importer
-    class Migrator
-
-      attr_reader :importer, :converter, :config, :json_validator
-
-      def initialize(settings)
-        @config = Configuration.new(settings)
-        @importer = ParallelImporter.new(@config)
-        @converter = ContentfulModelToJson.new(@config)
-        @json_validator = JsonSchemaValidator.new(@config)
-      end
-
-      def run(action, options = {})
-        case action.to_s
-          when '--create-contentful-model-from-json'
-            converter.create_content_type_json
-          when '--import-content-types'
-            importer.create_contentful_model(options)
-          when '--import'
-            importer.import_data(options[:threads])
-          when '--convert-content-model-to-json'
-            converter.convert_to_import_form
-          when '--publish-entries'
-            importer.publish_entries_in_threads
-          when '--test-credentials'
-            importer.test_credentials
-          when '--import-assets'
-            importer.import_only_assets
-          when '--publish-assets'
-            importer.publish_assets_in_threads(options[:threads])
-          when '--validate-schema'
-            json_validator.validate_schemas
-        end
-      end
-    end
-  end
-end