gettext-setup 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 975d57dd5789c927c93b764b9c073fa1c04acc76
-  data.tar.gz: c93ae9e686fdd706c2f4ee6765ba253d04344fd6
+  metadata.gz: e9f8891366b1c969292c1e2cd263c4781b186176
+  data.tar.gz: d45d299f1a2a21a1bf2d9333239a37ebd4c29f67
 SHA512:
-  metadata.gz: d1940fd699640b3ff376ab64231b748590b783c1bd57318cc68bb4b6e64a62c0eabd9c3851b2a13f12247a9a73bc482cc0856a34c75ed826a2bd1dc77d363b5a
-  data.tar.gz: 393598349f49bbd0e5c5c5c4cfb6f12bbf88d0f3c4cf6dbd0111f420078ad62377edf1fa0da20c561d8a07c1c31a56162475706797c4a4f44a7784181d4e41f6
+  metadata.gz: 05b006720a1ab0104d3daadcd1a325e871c8e79593e6d149940df5a7afecc9abe5f69420e0a155cc0b7f00035f05a1c2f76f998a164c356b89db78eadb64a211
+  data.tar.gz: e1d1b097ceec761dd79529b0d91b3999c7bd7178704ffc21d3c7f3a694bab98f5a1018e0c3a592799bb94c63dfd4971c8b35aae74a9cd0b95aed8542c5382d04

data/Gemfile.lock

@@ -18,20 +18,24 @@ GEM
       locale (>= 2.0.5)
       text (>= 1.3.0)
     json (1.8.3)
-    json (1.8.3-java)
     locale (2.1.2)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.4.2)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     safe_yaml (1.0.4)
     simplecov (0.10.0)
       docile (~> 1.1.0)
@@ -51,10 +55,10 @@ DEPENDENCIES
   gettext-setup!
   rack-test
   rake
-  rspec (~> 2.13.0)
-  rspec-core (~> 2.13.1)
-  rspec-expectations (~> 2.13.0)
-  rspec-mocks (~> 2.13.1)
+  rspec (~> 3.1)
+  rspec-core (~> 3.1)
+  rspec-expectations (~> 3.1)
+  rspec-mocks (~> 3.1)
   simplecov
   webmock
 

data/gettext-setup.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "gettext-setup"
-  spec.version       = "0.3"
+  spec.version       = "0.4"
   spec.authors       = ["Puppet"]
   spec.email         = ["info@puppet.com"]
   spec.description   = "A gem to ease i18n"
@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "rspec", "~> 2.13.0"
-  spec.add_development_dependency "rspec-core", "~> 2.13.1"
-  spec.add_development_dependency "rspec-expectations", "~> 2.13.0"
-  spec.add_development_dependency "rspec-mocks", "~> 2.13.1"
+  spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "rspec-core", "~> 3.1"
+  spec.add_development_dependency "rspec-expectations", "~> 3.1"
+  spec.add_development_dependency "rspec-mocks", "~> 3.1"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
 

data/lib/tasks/gettext.rake

@@ -34,7 +34,7 @@ namespace :gettext do
     copyright_holder = GettextSetup.config['copyright_holder']
     version=`git describe`
     system("rxgettext -o locales/#{project_name}.pot --no-wrap --sort-by-file " +
-           "--add-comments --msgid-bugs-address '#{bugs_address}' " +
+           "--no-location --add-comments --msgid-bugs-address '#{bugs_address}' " +
            "--package-name '#{package_name}' " +
            "--package-version '#{version}' " +
            "--copyright-holder='#{copyright_holder}' --copyright-year=#{Time.now.year} " +

data/spec/lib/gettext_setup_spec.rb

@@ -11,25 +11,25 @@ describe GettextSetup do
   context 'initialize' do
     it "sets up correctly" do
       # GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures'))
-      GettextSetup.locales_path.should =~ /\/spec\/fixtures/
-      config['project_name'].should == 'sinatra-i18n'
-      config['package_name'].should == 'Sinatra i18n demo'
-      config['default_locale'].should == 'en'
-      respond_to?(:_).should == true
+      expect(GettextSetup.locales_path).to match(/\/spec\/fixtures/)
+      expect(config['project_name']).to eq('sinatra-i18n')
+      expect(config['package_name']).to eq('Sinatra i18n demo')
+      expect(config['default_locale']).to eq('en')
+      expect(respond_to?(:_)).to eq(true)
     end
   end
   context 'negotiate_locale' do
     it "negotiates correctly" do
       FastGettext.locale = GettextSetup.negotiate_locale('de')
-      FastGettext.locale.should == 'de'
-      _('Hello, world!').should == 'Hallo, Welt!'
+      expect(FastGettext.locale).to eq('de')
+      expect(_('Hello, world!')).to eq('Hallo, Welt!')
     end
     it "chooses the default locale when no match is found" do
-      GettextSetup.negotiate_locale('no-match').should == config['default_locale']
+      expect(GettextSetup.negotiate_locale('no-match')).to eq(config['default_locale'])
     end
     it "chooses the language with the highest q value" do
-      GettextSetup.negotiate_locale('en;q=1, de;q=2').should == 'de'
-      GettextSetup.negotiate_locale('en;q=1, de;q=0').should == 'en'
+      expect(GettextSetup.negotiate_locale('en;q=1, de;q=2')).to eq('de')
+      expect(GettextSetup.negotiate_locale('en;q=1, de;q=0')).to eq('en')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext-setup
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Puppet
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.1'
   name: rspec
   prerelease: false
   type: :development
@@ -93,13 +93,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: '3.1'
   name: rspec-core
   prerelease: false
   type: :development
@@ -107,13 +107,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.1'
   name: rspec-expectations
   prerelease: false
   type: :development
@@ -121,13 +121,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: '3.1'
   name: rspec-mocks
   prerelease: false
   type: :development
@@ -135,7 +135,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: