contentful_bootstrap 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3069a4e110431c036457ac8839dc3e01d48146e3
-  data.tar.gz: 9fdeed19e3bdd8c97d77424e029b3f76b65a78e3
+  metadata.gz: 6a980f96add79c447bc7c0fefe9a9adf6ca7a0a2
+  data.tar.gz: c985777812c51b5ea56cbb72b408dc4084c4fd37
 SHA512:
-  metadata.gz: 1a29cc6c70e7e062bc0224b0831a1b3841059ba99e1954690cdf8dfe702bde14cd8090d7c8cad8d52766cef84d81df1e7a9e7bbd3352efced2b7c48a857924ac
-  data.tar.gz: b8638c2bbc11a3f8cb2f5c4a99e763c2220d8b318eccaea6c8e1a01c7123c7807b90aa2b852ea50b8d40229ba81ae3bf197fae3b1c1119b75eb31aa2da2a11d8
+  metadata.gz: 98d0f125902b0f630e68d221cc1d1f46e8e10bc4d8269053b8900a3b8cf6860a0ddc7734203672ae5e38cf95aaa57c07342b128a808ebc4a4dc6a3d778fe09e5
+  data.tar.gz: 0efd66ede3afb522c91aeea013097e7a638ac5e68ea9d0b38da2c28b1b722523e1e077848c5e09c5658b4f8841d948547aaafbbe7e9f7dedc83ba6ae81c91467

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v3.5.1
+### Fixed
+* Fixed organization fetching when no organization ID is provided on the configuration file [#54](https://github.com/contentful/contentful-bootstrap.rb/issues/54)
+
 ## v3.5.0
 
 ### Added

data/contentful_bootstrap.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr", '~> 2.9'
   spec.add_development_dependency "webmock", '~> 1.24'
   spec.add_development_dependency "rr"
+  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency 'listen', '~> 3.0.0'

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

@@ -48,6 +48,7 @@ module Contentful
               name: @space
             }
             options[:organization_id] = @token.read_organization_id unless @token.read_organization_id.nil?
+            management_client_init
             new_space = client.spaces.create(options)
           rescue Contentful::Management::NotFound
             fail "Organization ID is required, provide it in Configuration File" if no_input
@@ -71,9 +72,9 @@ module Contentful
         private
 
         def organizations
-          client = management_client_init
+          management_client_init
           url = client.base_url.sub('spaces', 'token')
-          response = client.get_http(url, nil, client.request_headers)
+          response = client.class.get_http(url, nil, client.request_headers)
           organization_ids = JSON.load(response.body.to_s)['includes']['Organization'].map do |org|
             sprintf('%-20s %s', org['name'], org['sys']['id'])
           end

data/lib/contentful/bootstrap/version.rb

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

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

@@ -85,6 +85,27 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
         command.run
       }
     end
+
+    it 'doesnt fail on multiple organizations #54' do
+      vcr('multiple_organizations') {
+        path = File.expand_path(File.join('spec', 'fixtures', 'ini_fixtures', 'no_org.ini'))
+        token = Contentful::Bootstrap::Token.new path
+
+        allow(Contentful::Bootstrap::Support).to receive(:gets).and_return('y')
+        allow(Contentful::Bootstrap::Support).to receive(:gets).and_return('n')
+        subject = described_class.new token, 'foo', quiet: true
+
+        expect(subject).to receive(:generate_token).with(space_double)
+        expect(Contentful::Bootstrap::Support).to receive(:gets) { 'foobar' }
+        expect(token).to receive(:write_organization_id).with('foobar')
+        expect(subject.client).to receive(:spaces).and_call_original
+        space_proxy_double = Object.new
+        expect(subject.client).to receive(:spaces) { space_proxy_double }
+        expect(space_proxy_double).to receive(:create).with(name: 'foo', organization_id: 'foobar') { space_double }
+
+        subject.run
+      }
+    end
   end
 
   describe 'integration' do

data/spec/fixtures/ini_fixtures/no_org.ini

@@ -0,0 +1,2 @@
+[global]
+CONTENTFUL_MANAGEMENT_ACCESS_TOKEN = foo