bump to 0.4.0 (#22)

* bump to 0.4.0 * compute checksum from the gemspec file * Add release workflow to CircleCI pipeline Signed-off-by: Matteo Joliveau <[email protected]> * Add shell.nix for Nix support Signed-off-by: Matteo Joliveau <[email protected]> * Fix yaml indentation Signed-off-by: Matteo Joliveau <[email protected]> * Fix workflow filters Signed-off-by: Matteo Joliveau <[email protected]> * fix tests Co-authored-by: Matteo Joliveau <[email protected]>
mikamai · Jan 21, 2021 · e80424a · e80424a
1 parent 0914fe9
commit e80424a
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 95 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,17 +1,16 @@
 version: 2
 jobs:
-  build:
+  test:
     docker:
-      - image: circleci/ruby:2.6.0
-        environment:
+      - image: circleci/ruby:2.7.0
     working_directory: ~/repo
 
     steps:
       - checkout
       - restore_cache:
           name: Restore Bundle cache
           keys:
-            - bundle-{{ checksum "Gemfile.lock" }}
+            - bundle-{{ checksum "onesignal-ruby.gemspec" }}
             - bundle-
       - run:
           name: Install dependencies
@@ -21,7 +20,7 @@ jobs:
           name: Save Bundle cache
           paths:
             - ./vendor/bundle
-          key: bundle-{{ checksum "Gemfile.lock" }}
+          key: bundle-{{ checksum "onesignal-ruby.gemspec" }}
 
       - run:
           name: Run tests
@@ -40,3 +39,50 @@ jobs:
       - store_artifacts:
           path: /tmp/test-results
           destination: test-results
+  release:
+    docker:
+      - image: circleci/ruby:2.7.0
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - restore_cache:
+          name: Restore Bundle cache
+          keys:
+            - bundle-{{ checksum "onesignal-ruby.gemspec" }}
+            - bundle-
+      - run:
+          name: Install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+      - save_cache:
+          name: Save Bundle cache
+          paths:
+            - ./vendor/bundle
+          key: bundle-{{ checksum "onesignal-ruby.gemspec" }}
+
+      - run:
+          name: Package gem
+          command: gem build --output release.gem
+
+      - run:
+          name: Publish gem
+          command: gem push release.gem
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test
+  test_release:
+    jobs:
+      - test:
+          filters: &release-filters
+            branches:
+              ignore: /.*/
+            tags:
+              only: ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
+      - release:
+          requires:
+            - test
+          filters:
+            <<: *release-filters
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use_nix
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@
 .env
 .env.*
 *.gem
+
+Gemfile.lock
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.7.0
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/lib/onesignal/version.rb b/lib/onesignal/version.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module OneSignal
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
   API_VERSION = 'v1'
 end
diff --git a/onesignal-ruby.gemspec b/onesignal-ruby.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'dotenv', '~> 2.5'
   spec.add_development_dependency 'factory_bot', '~> 4.11'
   spec.add_development_dependency 'rake', '~> 13.0'

diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,7 @@
+with import <nixpkgs> {};
+
+ pkgs.mkShell {
+   buildInputs = [
+     ruby_2_7
+  ];
+ }
diff --git a/spec/onesignal/notification/contents_spec.rb b/spec/onesignal/notification/contents_spec.rb
@@ -6,7 +6,7 @@
 
 describe Notification::Contents do
   it 'requires at least an english content' do
-    expect { described_class.new }.to raise_error ArgumentError, 'missing keyword: en'
+    expect { described_class.new }.to raise_error ArgumentError, /en/
   end
 
   it 'creates a new Content with only english' do

diff --git a/spec/onesignal/notification/headings_spec.rb b/spec/onesignal/notification/headings_spec.rb
@@ -6,7 +6,7 @@
 
 describe Notification::Headings do
   it 'requires at least an english content' do
-    expect { described_class.new }.to raise_error ArgumentError, 'missing keyword: en'
+    expect { described_class.new }.to raise_error ArgumentError, /en/
   end
 
   it 'creates a new Content with only english' do

diff --git a/spec/onesignal/segment_spec.rb b/spec/onesignal/segment_spec.rb
@@ -5,7 +5,7 @@
 
 describe Segment do
   it 'requires a name' do
-    expect { described_class.new }.to raise_error ArgumentError, 'missing keyword: name'
+    expect { described_class.new }.to raise_error ArgumentError, /name/
   end
 
   context 'json' do
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,3 +15,5 @@ @@
     .env
     .env.*
     *.gem
+    Gemfile.lock