contentful_bootstrap 3.5.2 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c266426ff6158f7c5254cab98f9ca38bd5fe20f
-  data.tar.gz: 5993a12e19927dc0de0caa3e93e58863e59b83f1
+  metadata.gz: 145e81e1443e293e56393c88c8609c4520abf6b5
+  data.tar.gz: 7ab10aa65b840cb8d00bd463e035ad8b0745484c
 SHA512:
-  metadata.gz: aa0980d9e60346eaa9dfd951ff10f007505fd68326f4b6c832842b9feb58b29fb95da89160a864e38c47fd9e7edd6822cf69c63f2940a9416adf92d432ab544b
-  data.tar.gz: 779f7ef0e31f395930d2a14b20b3a45d156dfb61a951d73d132b4021f803461560fb25d708db23b0a7000629e0c1e27a077ba3e09c994251c8502a98a32ebf97
+  metadata.gz: 98bfc62b2a1eb07ab126fb1ab63bfdb7afdaf1d1315b95ec2e6b8b77a06ddfaba54bd99758cba01fc2ad09620fb0839c36bde47091946cbd3cd0d47de23ed544
+  data.tar.gz: 90ac5afb07bda160a8384a79d7a739bd9d775a1c7f90c16854d77c391b4b635c04ec12e57c92ceced10451715f2476b7b32568df106e1042091c71bfdd542105

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## v3.6.1
+
+### Changed
+* Changed User Agent Headers to use the new format
+* Updated versions of CMA and CDA SDK to latest available
+
 ## v3.5.2
 
 ### Fixed

data/Gemfile

@@ -3,8 +3,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "launchy"
-gem "inifile"
-gem "contentful-management"
-gem "contentful"
 gem 'pry'

data/contentful_bootstrap.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency 'listen', '~> 3.0.0'
   spec.add_runtime_dependency "launchy"
-  spec.add_runtime_dependency "contentful-management", '~> 1.0'
-  spec.add_runtime_dependency "contentful", "> 0", "< 3"
+  spec.add_runtime_dependency "contentful-management", '~> 1.8'
+  spec.add_runtime_dependency "contentful", ">= 2.1.0", "< 3"
   spec.add_runtime_dependency "inifile"
 end

data/lib/contentful/bootstrap.rb

@@ -3,6 +3,5 @@ require 'contentful/bootstrap/server'
 require 'contentful/bootstrap/version'
 require 'contentful/bootstrap/commands'
 require 'contentful/bootstrap/templates'
-require 'contentful/bootstrap/management'
 require 'contentful/bootstrap/command_runner'
 require 'contentful/bootstrap/templates/links'

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

@@ -1,7 +1,7 @@
 require 'net/http'
+require 'contentful/management'
 require 'contentful/bootstrap/server'
 require 'contentful/bootstrap/support'
-require 'contentful/bootstrap/management'
 
 module Contentful
   module Bootstrap
@@ -35,7 +35,12 @@ module Contentful
         private
 
         def management_client_init
-          @client ||= ::Contentful::Bootstrap::Management.new(@token.read, raise_errors: true)
+          @client ||= ::Contentful::Management::Client.new(
+            @token.read,
+            raise_errors: true,
+            integration_name: 'bootstrap',
+            integration_version: ::Contentful::Bootstrap::VERSION
+          )
         end
 
         def configuration

data/lib/contentful/bootstrap/generator.rb

@@ -7,10 +7,15 @@ require 'contentful/bootstrap/version'
 module Contentful
   module Bootstrap
     class Generator
-      attr_reader :content_types_only
+      attr_reader :content_types_only, :client
 
       def initialize(space_id, access_token, content_types_only)
-        @client = Contentful::Client.new(access_token: access_token, space: space_id)
+        @client = Contentful::Client.new(
+          access_token: access_token,
+          space: space_id,
+          integration_name: 'bootstrap',
+          integration_version: ::Contentful::Bootstrap::VERSION
+        )
         @content_types_only = content_types_only
       end
 

data/lib/contentful/bootstrap/version.rb

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

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

@@ -44,7 +44,12 @@ describe Contentful::Bootstrap::Commands::Base do
   describe 'instance methods' do
     it '#management_client_init' do
       allow_any_instance_of(described_class).to receive(:configuration)
-      expect(Contentful::Management::Client).to receive(:new).with(token.read, raise_errors: true)
+      expect(Contentful::Management::Client).to receive(:new).with(
+        token.read,
+        raise_errors: true,
+        integration_name: 'bootstrap',
+        integration_version: Contentful::Bootstrap::VERSION
+      )
 
       described_class.new(token, 'foo', quiet: true)
     end

data/spec/contentful/bootstrap/generator_spec.rb

@@ -3,6 +3,12 @@ require 'spec_helper'
 describe Contentful::Bootstrap::Generator do
   subject { Contentful::Bootstrap::Generator.new('wl1z0pal05vy', '48d7db7d4cd9d09df573c251d456f4acc72141b92f36e57f8684b36cf5cfff6e', false) }
 
+  describe 'user agent headers' do
+    it 'client has proper integration data' do
+      expect(subject.client.integration_info).to eq(name: 'bootstrap', version: Contentful::Bootstrap::VERSION)
+    end
+  end
+
   describe 'JSON template generator' do
     it 'can generate a JSON template for a given space' do
       vcr('generate_json') {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful_bootstrap
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.6.1
 platform: ruby
 authors:
 - David Litvak Bruno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,21 +184,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: contentful
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -206,9 +206,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -258,7 +258,6 @@ files:
 - lib/contentful/bootstrap/commands/update_space.rb
 - lib/contentful/bootstrap/constants.rb
 - lib/contentful/bootstrap/generator.rb
-- lib/contentful/bootstrap/management.rb
 - lib/contentful/bootstrap/server.rb
 - lib/contentful/bootstrap/support.rb
 - lib/contentful/bootstrap/templates.rb
@@ -280,7 +279,6 @@ files:
 - 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
 - spec/contentful/bootstrap/support_spec.rb
 - spec/contentful/bootstrap/templates/base_spec.rb
@@ -356,7 +354,6 @@ test_files:
 - 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
 - spec/contentful/bootstrap/support_spec.rb
 - spec/contentful/bootstrap/templates/base_spec.rb

data/lib/contentful/bootstrap/management.rb

@@ -1,11 +0,0 @@
-require 'contentful/management'
-
-module Contentful
-  module Bootstrap
-    class Management < ::Contentful::Management::Client
-      def user_agent
-        Hash['User-Agent', "ContentfulBootstrap/#{Contentful::Bootstrap::VERSION}"]
-      end
-    end
-  end
-end

data/spec/contentful/bootstrap/management_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe Contentful::Bootstrap::Management do
-  it ':user_agent' do
-    expect(subject.user_agent).to eq('User-Agent' => "ContentfulBootstrap/#{Contentful::Bootstrap::VERSION}")
-  end
-
-  it ':request_headers' do
-    expect(subject.request_headers).to include('User-Agent' => "ContentfulBootstrap/#{Contentful::Bootstrap::VERSION}")
-  end
-end