contentful_bootstrap 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4714e403b05588c84e46a5f5e66af2224eb566d
-  data.tar.gz: a2ef00692e18a5f7251c88b3ffdba02be6a6f39e
+  metadata.gz: 4672f655b4d3a32b439e75feec5b7d5fddbcfb5e
+  data.tar.gz: 75bcb4e3054e0a5cbc1abe6a2e7c0083f7a718fe
 SHA512:
-  metadata.gz: 79e35a1d6e63c0bc61b9e8e3eb0ad0cf8a4222c8ebaf2a010d3cf75f728304d8384b24f1ac129415d254bcfc8d5ea0e3045d243612b1dba64538be9a0dbc84dc
-  data.tar.gz: 03aa80d7fa3ac65ed38a27515eed71605715605de6ecf5a191d04ce9fc0e0277b8fbb6a114113029e093cad3faddf9c696515c39758d21119819d7caae2841c0
+  metadata.gz: c54a6ad2254d281a207b7764a419313b69b4caf1eff76cd03fb01bc01b757b8f537f73d538122345ccae69ae5b89f782748a22509278881d2122403b19e62140
+  data.tar.gz: 230b8f6a1b6413ce6888bad8a0252435bbc3602a183d31e4aaef66bab51894ceaab68943b4492352bfb3517c4ed984c2d873b8e15056afb844bc2789918e723d

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## v3.4.0
+### Added
+* Add `-v` and `--version` flags to output current version
+* Add possibility to define `CONTENTFUL_ORGANIZATION_ID` in your `.contentfulrc` file [#44](https://github.com/contentful/contentful-bootstrap.rb/issues/44)
+
 ## v3.3.0
 ### Added
 * Adds possibility to change `contentType` for Assets [#39](https://github.com/contentful/contentful-bootstrap.rb/issues/39)

data/bin/contentful_bootstrap

@@ -75,6 +75,10 @@ global = OptionParser.new do |opts|
     Available commands are:
     \t#{subcommands.keys.sort.join("\n\t")}
   HELP
+  opts.on_tail("-v", "--version", "Show Version") do
+    puts "Contentful Bootstrap: #{Contentful::Bootstrap::VERSION}"
+    exit(0)
+  end
 end
 
 global.order!
@@ -85,7 +89,7 @@ space = ARGV.shift unless is_help
 
 options[:access_token] = ARGV.shift if command == "generate_json" && !is_help
 
-if subcommands.has_key? command
+if subcommands.key? command
   subcommands[command].order!
 
   unless STDIN.tty? && STDOUT.tty?

data/contentful_bootstrap.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'rake', '< 11.0'
+  spec.add_development_dependency 'public_suffix', '< 1.5'
+  spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency "vcr", '~> 2.9'
   spec.add_development_dependency "webmock", '~> 1.24'
   spec.add_development_dependency "rr"

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

@@ -45,12 +45,18 @@ module Contentful
         def fetch_space
           new_space = nil
           begin
-            new_space = Contentful::Management::Space.create(name: @space)
+            options = {
+              name: @space
+            }
+            options[:organization_id] = @token.read_organization_id unless @token.read_organization_id.nil?
+            new_space = Contentful::Management::Space.create(options)
           rescue Contentful::Management::NotFound
             puts 'Your account has multiple organizations:'
             puts organizations.join("\n")
             print 'Please insert the Organization ID you\'d want to create the spaces for: '
             organization_id = gets.chomp
+            @token.write_organization_id(organization_id)
+            puts 'Your Organization ID has been stored as the default organization.'
             new_space = Contentful::Management::Space.create(
               name: @space,
               organization_id: organization_id

data/lib/contentful/bootstrap/token.rb

@@ -8,6 +8,7 @@ module Contentful
       DEFAULT_PATH = '.contentfulrc'.freeze
       MANAGEMENT_TOKEN = 'CONTENTFUL_MANAGEMENT_ACCESS_TOKEN'.freeze
       DELIVERY_TOKEN = 'CONTENTFUL_DELIVERY_ACCESS_TOKEN'.freeze
+      ORGANIZATION_ID = 'CONTENTFUL_ORGANIZATION_ID'.freeze
       SPACE_ID = 'SPACE_ID'.freeze
 
       attr_reader :config_path
@@ -32,12 +33,20 @@ module Contentful
         raise 'Token not found'
       end
 
+      def read_organization_id
+        config_file[config_section].fetch(ORGANIZATION_ID, nil)
+      end
+
       def write(value, section = nil, key = MANAGEMENT_TOKEN)
         file = config_file
         file[section || config_section][key] = value
         file.save
       end
 
+      def write_organization_id(organization_id)
+        write(organization_id, nil, ORGANIZATION_ID)
+      end
+
       def write_access_token(space_name, token)
         write(token, space_name, DELIVERY_TOKEN)
       end

data/lib/contentful/bootstrap/version.rb

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

data/spec/contentful/bootstrap/token_spec.rb

@@ -5,6 +5,7 @@ describe Contentful::Bootstrap::Token do
   let(:no_token_path) { File.expand_path(File.join('spec', 'fixtures', 'ini_fixtures', 'no_token.ini')) }
   let(:sections_path) { File.expand_path(File.join('spec', 'fixtures', 'ini_fixtures', 'sections.ini')) }
   let(:no_global_path) { File.expand_path(File.join('spec', 'fixtures', 'ini_fixtures', 'no_global.ini')) }
+  let(:with_org_id) { File.expand_path(File.join('spec', 'fixtures', 'ini_fixtures', 'orgid.ini')) }
   subject { Contentful::Bootstrap::Token.new(path) }
 
   describe 'attributes' do
@@ -76,6 +77,16 @@ describe Contentful::Bootstrap::Token do
       end
     end
 
+    describe '#read_organization_id' do
+      it 'nil if default org id is not set' do
+        expect(subject.read_organization_id).to be_nil
+      end
+
+      it 'returns value of org id is set' do
+        expect(subject.class.new(with_org_id).read_organization_id).to eq 'my_org'
+      end
+    end
+
     describe 'write methods' do
       before do
         @file = subject.config_file
@@ -99,6 +110,11 @@ describe Contentful::Bootstrap::Token do
         expect(@file['some_space']['SPACE_ID']).to eq 'asd'
       end
 
+      it '#write_organization_id' do
+        subject.write_organization_id('foo')
+        expect(@file['global']['CONTENTFUL_ORGANIZATION_ID']).to eq 'foo'
+      end
+
       describe '#write' do
         it 'writes management tokens when only value is sent' do
           expect(@file['global']['CONTENTFUL_MANAGEMENT_ACCESS_TOKEN']).to eq 'foobar'

data/spec/fixtures/ini_fixtures/orgid.ini

@@ -0,0 +1,3 @@
+[global]
+CONTENTFUL_MANAGEMENT_ACCESS_TOKEN = foobar
+CONTENTFUL_ORGANIZATION_ID = my_org

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful_bootstrap
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - David Litvak Bruno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,30 +28,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +275,7 @@ files:
 - spec/fixtures/ini_fixtures/contentfulrc.ini
 - spec/fixtures/ini_fixtures/no_global.ini
 - spec/fixtures/ini_fixtures/no_token.ini
+- spec/fixtures/ini_fixtures/orgid.ini
 - spec/fixtures/ini_fixtures/sections.ini
 - spec/fixtures/json_fixtures/asset_no_transform.json
 - spec/fixtures/json_fixtures/display_field.json
@@ -333,6 +348,7 @@ test_files:
 - spec/fixtures/ini_fixtures/contentfulrc.ini
 - spec/fixtures/ini_fixtures/no_global.ini
 - spec/fixtures/ini_fixtures/no_token.ini
+- spec/fixtures/ini_fixtures/orgid.ini
 - spec/fixtures/ini_fixtures/sections.ini
 - spec/fixtures/json_fixtures/asset_no_transform.json
 - spec/fixtures/json_fixtures/display_field.json