danger-samsao 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce381ca0181a3c9df3c2c536e6d707bce6defcbe
-  data.tar.gz: 14d687d8d21fb34fd864526eb1fd82832b0835cd
+  metadata.gz: 17a57df336d68834fbc0789edfd27de8f66ad1b6
+  data.tar.gz: a1465dc66e0437c9659bbe61d4baae682133dc3a
 SHA512:
-  metadata.gz: c73357ebc4b5683b292f389f08e810fb5467997bddbcc6c5b6bc27250c8b659b822de6a7d36106e5392b292d29fe8d8f516f20877028ee523407054e291a6695
-  data.tar.gz: 00bec8ce51b8b01b75a3d2b9ee6fe5fab5a550b1763714eea63a2386837be29a85182b558b3ec01bbc9e20d581be1b096b08507638114e0095ea2cc24750c68b
+  metadata.gz: 942d127d15303f2a7fcf8fb1df32ba074e5c401e5e23b732646c3b12ca5130ac2ed6fa6a2d3d602614201935a1755186570b467cf17d37813e05b483298606c2
+  data.tar.gz: 7f7b39dc19d1a8fbc998e2afc17191043b16947a61a61636576159b400a78f2a33635d89a1c95856959ae3547b46fe47917bb9851c50afb77a3d9b1cddf6e8dd

data/CHANGELOG.md

@@ -1,9 +1,50 @@
+## 0.2.0 (May 9, 2017)
+
+#### Breaking Changes
+
+ * Changed `trivial_change?` logic by only flagging PR as trivial using
+   the PR title and not the branch name anymore.
+
+ * Removed `trivial_branch?` support. It was replaced by `support_branch?`
+   instead to more closely follow git flow branching model.
+
+#### Features
+
+ * Enhanced the changelog missing action to not fail when changelog is
+   not updated, project is of type `:application` and PR is on a support
+   branch.
+
+ * Added config option `project_type` which can be one of `:application`
+   or `:library` and defaults to `:application`.
+
+ * Enhanced `fix_branch?` to support `hotfix/` and `bugfix/` prefixes.
+
+ * Added `support_branch?` support.
+
+ * Updated `trivial_change?` helper to support variations in marker
+   for `#typo` marker, now supports `#typos`.
+
+#### Fixes
+
+ * Fixed branching model to fully support git flow branching model which
+   is the branching model we use.
+
+#### Support
+
+ * Added `Danger` to project, eating our own dog food.
+
+ * Reformatted `CHANGELOG.md` a bit to split by sections.
+
 ## 0.1.1 (May 4, 2017)
 
+#### Features
+
  * Open source to MIT.
 
 ## 0.1.0 (May 1, 2017)
 
+#### Features
+
  * Added `fail_when_merge_commit_detected` action.
 
  * Added `warn_when_work_in_progess_pr` action.

data/Dangerfile

@@ -0,0 +1,22 @@
+# rubocop:disable Style/FileName
+
+## Config
+samsao.config do
+  project_type :library
+  sources '.*'
+end
+
+## Errors
+samsao.fail_when_changelog_update_missing
+samsao.fail_when_merge_commit_detected
+samsao.fail_when_non_single_commit_feature
+samsao.fail_when_wrong_branching_model
+
+## Warnings
+samsao.warn_when_work_in_progess_pr
+
+## Messages
+unless status_report[:errors].empty?
+  message 'If this was a trivial change, typo fix or tooling related, ' \
+          'you can add #trivial, #typo or #tool respectively in your PR title.'
+end

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in danger-samsao.gemspec
 gemspec
+
+gem 'danger', '~> 5.1'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-samsao (0.1.1)
+    danger-samsao (0.2.0)
       danger-plugin-api (~> 1.0)
 
 GEM
@@ -19,7 +19,7 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.1.1)
+    danger (5.2.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -86,19 +86,19 @@ GEM
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     rubocop (0.48.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
@@ -122,6 +122,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.3)
+  danger (~> 5.1)
   danger-samsao!
   guard (~> 2.14)
   guard-rspec (~> 4.7)
@@ -129,7 +130,7 @@ DEPENDENCIES
   pry (~> 0.11.0.pre2)
   rake (~> 10.0)
   rspec (~> 3.4)
-  rubocop (~> 0.41)
+  rubocop (~> 0.48)
   yard (~> 0.8)
 
 BUNDLED WITH

data/README.md

@@ -7,6 +7,32 @@ A Danger plugin bringing Samsao's PR guideline into code.
 Simply add `danger-samsao` to your `Gemfile` and configure your `Dangerfile`
 using all the nice goodies.
 
+## Quick Start
+
+Here a sample `Dangerfile` that you can use to bootstrap your project:
+
+```
+## Config
+samsao.config do
+  sources '.*'
+end
+
+## Errors
+samsao.fail_when_changelog_update_missing
+samsao.fail_when_merge_commit_detected
+samsao.fail_when_non_single_commit_feature
+samsao.fail_when_wrong_branching_model
+
+## Warnings
+samsao.warn_when_work_in_progess_pr
+
+## Messages
+unless status_report[:errors].empty?
+  message 'If this was a trivial change, typo fix or tooling related, ' \
+          'you can add #trivial, #typo or #tool respectively in your PR title.'
+end
+```
+
 ## Usage
 
 Methods and attributes from this plugin are available in
@@ -22,13 +48,13 @@ your `Dangerfile` under the `samsao` namespace.
    * [samsao.fail_when_wrong_branching_model](#branching-model)
    * [samsao.warn_when_work_in_progess_pr](#when-work-in-progess-pr)
  * [Helpers](#helpers)
-   * [samsao.changelog_modified?](#changelog-modified-)
-   * [samsao.feature_branch?](#feature-branch-)
-   * [samsao.fix_branch?](#fix-branch-)
-   * [samsao.has_app_changes?](#has-app-changes-)
-   * [samsao.release_branch?](#release-branch-)
-   * [samsao.trivial_branch?](#trivial-branch-)
-   * [samsao.trivial_change?](#trivial-change-)
+   * [samsao.changelog_modified?](#changelog-modified)
+   * [samsao.feature_branch?](#feature-branch)
+   * [samsao.fix_branch?](#fix-branch)
+   * [samsao.has_app_changes?](#has-app-changes)
+   * [samsao.release_branch?](#release-branch)
+   * [samsao.support_branch?](#support-branch)
+   * [samsao.trivial_change?](#trivial-change)
 
 ### Config
 
@@ -38,20 +64,32 @@ easier. This is done by using the `config` attributes the plugin:
 ```
 samsao.config do
   changelogs 'CHANGELOG.yml'
+  project_type :library
   sources 'app/src'
 end
 ```
 
 #### Changelogs
 
-Default: `CHANGELOG.md`
+Defaults: `[CHANGELOG.md]`
 
 Enable to change the CHANGELOG file paths looked upon when checking if
 CHANGELOG file has been modified or not.
 
+#### Project Type
+
+Defaults: `:application`
+
+Change the kind of project your are currently developing. This settings
+affects these actions and helpers:
+
+ * [samsao.fail_when_changelog_update_missing](#changelog-update-missing)
+
+See the exact actions or helpers for precise details about implications.
+
 #### Sources
 
-Default: `<Empty>`
+Default: `[]`
 
 Enable to change which paths are considered has being source files of the
 project. Multiple entries can be passed. Accepts multiple entries to be passed:
@@ -88,7 +126,15 @@ samsao.fail_when_wrong_branching_model
 ```
 
 Going to make the PR fails when the branch does not respect the git branching
-model.
+model. We follow git flow branching model and failure will occurs if the branch
+name does not start with one of the following prefixes:
+
+ * `fix/`
+ * `bugfix/`
+ * `hotfix/`
+ * `feature/`
+ * `release/`
+ * `support/`
 
 #### CHANGELOG Update Missing
 
@@ -96,8 +142,13 @@ model.
 samsao.fail_when_changelog_update_missing
 ```
 
-Going to make the PR fails when it's a feature branch (starts with `feature/`)
-or fix branch (`fix/`) and the CHANGELOG file was not updated.
+This action reports a failure when a PR is made that is not flagged
+as a [trivial change](#trivial-change) and the changelog (based on
+`changelogs` config options) has not been modified.
+
+When the project is of type `:application`, a change made to a [support
+branch](#support-branch) will not trigger a failure even if the changelog
+is not updated.
 
 #### Feature Branch Multiple Commits
 
@@ -171,7 +222,7 @@ Returns true if the PR branch starts with `feature/`.
 samsao.fix_branch?
 ```
 
-Returns true if the PR branch starts with `fix/`.
+Returns true if the PR branch starts with `fix/`, `bugfix/` or `hotfix/`.
 
 #### Release Branch?
 
@@ -181,13 +232,13 @@ samsao.release_branch?
 
 Returns true if the PR branch starts with `release/`.
 
-#### Trivial Branch?
+#### Support Branch?
 
 ```
-samsao.trivial_branch?
+samsao.support_branch?
 ```
 
-Returns true if the PR branch starts with `trivial/`.
+Returns true if the PR branch starts with `support/`.
 
 #### Trivial Change?
 
@@ -195,8 +246,7 @@ Returns true if the PR branch starts with `trivial/`.
 samsao.trivial_change?
 ```
 
-Returns true if the PR title contains `#trivial` or `#typo` or the branch is a
-trivial branch ([trivial_branch?](#trivial-branch-) helper).
+Returns true if the PR title contains `#trivial`, `#typo` or `#typos`.
 
 ## Development
 
@@ -232,11 +282,12 @@ Assume for the rest of this section that we are releasing version `0.1.0`
 and today's date is `May 1st, 2017`. Terminal commands are given, but feel
 free to use `SourceTree` or anything else.
 
-Start by checking out the commit that was flagged as the release commit (could be
-the `develop` branch) and name the branch `release/0.1.0`:
+Start by checking out the `develop` branch and ensure you are up-to-date
+with remote
 
 ```
-git checkout -b release/0.1.0 aeb156fb4a
+git checkout develop
+git pull
 ```
 
 Once on the branch, modify `CHANGELOG.md` so that `In progress` is replaced by
@@ -256,17 +307,21 @@ Once the commit is done, simply run `bundle exec rake release`. This will
 ask you for the Samsao's RubyGems credentials (only if it's your first
 release, ask a system administrator to get them). It will create a tag
 on the current commit of the current branch (should be the release commit
-made earlier) named `v0.1.0`. And it will finally push the tag to the
+made earlier) named `v0.1.0`. And it will finally push the branch & tag to the
 repository as well as building and publishing the gem on RubyGems.
 
 Last thing to do is bumping to next development version. Edit back
 `CHANGELOG.md` so that `## In progress` is the new section header and
 add a bunch of empty lines (around 10, only 2 shown in the example for
-brevity) starting with a **space** followed by a **star**:
+brevity) into single `Features` section (add other sections when updating
+the CHANGELOG). Each line should be starting with a **space** followed by
+a **star**:
 
 ```
 ## In progress
 
+#### Features
+
  *
 
  *

data/bitrise.yml

@@ -25,6 +25,7 @@ workflows:
     before_run:
     - _cache_pull
     - _prepare
+    - _danger
     - _lint
     - _test
 
@@ -48,6 +49,15 @@ workflows:
     - cache-pull@0.9.2:
         title: Pull cache
 
+  _danger:
+    steps:
+    - script@1.1.3:
+        title: Danger
+        run_if: .IsPR
+        inputs:
+        - content: |-
+            bundle exec danger
+
   _lint:
     steps:
     - script@1.1.3:

data/danger-samsao.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '~> 2.0'
+
   spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
@@ -27,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec', '~> 4.7'
   spec.add_development_dependency 'pry', '~> 0.11.0.pre2'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rubocop', '~> 0.41'
+  spec.add_development_dependency 'rubocop', '~> 0.48'
   spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'yard', '~> 0.8'
 end

data/lib/samsao/actions.rb

@@ -5,7 +5,7 @@ module Samsao
     #
     # @return [void]
     def fail_when_wrong_branching_model
-      message = 'Your branch should be prefixed with feature/, fix/, trivial/ or release/!'
+      message = 'Your branch should be prefixed with feature/, fix/, bugfix/, hotfix/, release/ or support/!'
 
       fail message unless respects_branching_model
     end
@@ -25,10 +25,9 @@ module Samsao
     # @return [void]
     def fail_when_changelog_update_missing
       return if trivial_change?
+      return if support_branch? && config.project_type == :application
 
-      message = 'You did a fix or a feature without updating CHANGELOG file!'
-
-      fail message unless changelog_modified?
+      fail 'You did a change without updating CHANGELOG file!' unless changelog_modified?
     end
 
     # Fails when one or more merge commit is detected.

data/lib/samsao/config.rb

@@ -1,9 +1,12 @@
 module Danger
   # Samsao's config class
   class SamsaoConfig
+    PROJECT_TYPES = [:application, :library].freeze
+
     def initialize
       @changelogs = ['CHANGELOG.md']
       @sources = []
+      @project_type = :application
     end
 
     def changelogs(*entries)
@@ -12,10 +15,31 @@ module Danger
       @changelogs = entries
     end
 
+    def project_type(type = nil)
+      return @project_type if type.nil?
+
+      @project_type = validate_project_type(type)
+    end
+
     def sources(*entries)
       return @sources if entries.nil? || entries.empty?
 
       @sources = entries
     end
+
+    private
+
+    def validate_project_type(type)
+      return type if valid_project_type?(type)
+
+      actual_type = type.is_a?(Symbol) ? ":#{type}" : type.to_s
+      valid_types = PROJECT_TYPES.map { |valid_type| ":#{valid_type}" }.join(', ')
+
+      raise "Project type '#{actual_type}' is invalid, must be one of '#{valid_types}'"
+    end
+
+    def valid_project_type?(type)
+      PROJECT_TYPES.include?(type)
+    end
   end
 end

data/lib/samsao/gem_version.rb

@@ -1,3 +1,3 @@
 module Samsao
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/samsao/helpers.rb

@@ -20,11 +20,11 @@ module Samsao
       git_branch.start_with?('feature/')
     end
 
-    # Return true if the current PR branch is a feature branch
+    # Return true if the current PR branch is a bug fix branch
     #
     # @return [void]
     def fix_branch?
-      git_branch.start_with?('fix/')
+      !(%r{^(bug|hot)?fix/} =~ git_branch).nil?
     end
 
     # Return true if the current PR branch is a release branch
@@ -34,19 +34,19 @@ module Samsao
       git_branch.start_with?('release/')
     end
 
-    # Return true if the current PR branch is a trivial branch
+    # Return true if the current PR branch is a support branch
     #
     # @return [void]
-    def trivial_branch?
-      git_branch.start_with?('trivial/')
+    def support_branch?
+      git_branch.start_with?('support/')
     end
 
-    # Return true if the current PR is a trivial change (branch is `trivial_branch?`)
-    # or PR title contains #trivial or #typo markers.
+    # Return true if the current PR is a trivial change, i.e. if
+    # PR title contains #trivial or #typo markers.
     #
     # @return [void]
     def trivial_change?
-      trivial_branch? || ['#trivial', '#typo'].any? { |modifier| github.pr_title.include?(modifier) }
+      !(/#(trivial|typo(s)?)/ =~ github.pr_title).nil?
     end
 
     # Return true if any source files are in the git modified files list.
@@ -73,7 +73,7 @@ module Samsao
     end
 
     def respects_branching_model
-      feature_branch? || fix_branch? || release_branch? || trivial_branch?
+      feature_branch? || fix_branch? || release_branch? || support_branch?
     end
   end
 end

data/spec/samsao_branch_helper_spec.rb

@@ -26,6 +26,9 @@ module Danger
           data_set = [
             { branch: 'feature/a', expected: false },
             { branch: 'fix/a', expected: true },
+            { branch: 'bugfix/a', expected: true },
+            { branch: 'hotfix/a', expected: true },
+            { branch: 'otherfix/a', expected: false },
             { branch: 'random', expected: false },
           ]
 
@@ -48,16 +51,16 @@ module Danger
           end
         end
 
-        it 'supports trivial_branch? correctly' do
+        it 'supports support_branch? correctly' do
           data_set = [
-            { branch: 'trivial/a', expected: true },
+            { branch: 'support/a', expected: true },
             { branch: 'fix/a', expected: false },
             { branch: 'random', expected: false },
           ]
 
           data_set.each do |data|
             allow(@plugin.github).to receive(:branch_for_head).and_return(data[:branch])
-            expect(@plugin.trivial_branch?).to be(data[:expected])
+            expect(@plugin.support_branch?).to be(data[:expected])
           end
         end
       end

data/spec/samsao_branching_model_spec.rb

@@ -6,11 +6,12 @@ module Danger
       before do
         @dangerfile = testing_dangerfile
         @plugin = @dangerfile.samsao
-        @wrong_branching_model = 'Your branch should be prefixed with feature/, fix/, trivial/ or release/!'
+        @wrong_branching_model = 'Your branch should be prefixed with feature/, fix/, ' \
+                                 'bugfix/, hotfix/, release/ or support/!'
       end
 
       describe 'branching model' do
-        ['fix', 'feature', 'release', 'trivial'].each do |branch_prefix|
+        ['fix', 'bugfix', 'hotfix', 'feature', 'release', 'support'].each do |branch_prefix|
           it "continues on #{branch_prefix}/ prefix" do
             allow(@plugin.github).to receive(:branch_for_head).and_return("#{branch_prefix}/something")
 

data/spec/samsao_changelog_updated_spec.rb

@@ -6,36 +6,38 @@ module Danger
       before do
         @dangerfile = testing_dangerfile
         @plugin = @dangerfile.samsao
-        @changelog_needs_update = 'You did a fix or a feature without updating CHANGELOG file!'
+        @changelog_needs_update = 'You did a change without updating CHANGELOG file!'
 
         allow(@plugin.github).to receive(:pr_title).and_return('Something')
       end
 
       describe 'changelog updated' do
-        it 'continues on non-feature & non-fix branch' do
-          allow(@plugin.github).to receive(:branch_for_head).and_return('trivial/a')
+        it 'continues on support branch' do
+          allow(@plugin.github).to receive(:branch_for_head).and_return('support/a')
 
           @plugin.fail_when_changelog_update_missing
 
           expect(@dangerfile).to have_no_error
         end
 
-        it 'continues on feature branch and CHANGELOG updated' do
-          allow(@plugin.github).to receive(:branch_for_head).and_return('feature/a')
-          allow(@plugin.git).to receive(:modified_files).and_return(['CHANGELOG.md'])
+        ['fix', 'bugfix', 'hotfix', 'feature', 'release'].each do |branch|
+          it "continues on #{branch} branch and CHANGELOG updated" do
+            allow(@plugin.github).to receive(:branch_for_head).and_return("#{branch}/a")
+            allow(@plugin.git).to receive(:modified_files).and_return(['CHANGELOG.md'])
 
-          @plugin.fail_when_changelog_update_missing
+            @plugin.fail_when_changelog_update_missing
 
-          expect(@dangerfile).to have_no_error
-        end
+            expect(@dangerfile).to have_no_error
+          end
 
-        it 'continues on fix branch and CHANGELOG updated' do
-          allow(@plugin.github).to receive(:branch_for_head).and_return('fix/a')
-          allow(@plugin.git).to receive(:modified_files).and_return(['CHANGELOG.md'])
+          it "fails on #{branch} branch and CHANGELOG not updated" do
+            allow(@plugin.github).to receive(:branch_for_head).and_return("#{branch}/a")
+            allow(@plugin.git).to receive(:modified_files).and_return([])
 
-          @plugin.fail_when_changelog_update_missing
+            @plugin.fail_when_changelog_update_missing
 
-          expect(@dangerfile).to have_no_error
+            expect(@dangerfile).to have_error(@changelog_needs_update)
+          end
         end
 
         it 'accepts customized changelogs path' do
@@ -73,8 +75,25 @@ module Danger
           expect(@dangerfile).to have_no_error
         end
 
-        it 'fails on feature branch and CHANGELOG not updated' do
-          allow(@plugin.github).to receive(:branch_for_head).and_return('feature/a')
+        it 'continues on support_branch within application project and CHANGELOG not updated' do
+          @plugin.config do
+            project_type :application
+          end
+
+          allow(@plugin).to receive(:support_branch?).and_return(true)
+          allow(@plugin.git).to receive(:modified_files).and_return([])
+
+          @plugin.fail_when_changelog_update_missing
+
+          expect(@dangerfile).to have_no_error
+        end
+
+        it 'fails on support_branch within library project and CHANGELOG not updated' do
+          @plugin.config do
+            project_type :library
+          end
+
+          allow(@plugin).to receive(:support_branch?).and_return(true)
           allow(@plugin.git).to receive(:modified_files).and_return([])
 
           @plugin.fail_when_changelog_update_missing

data/spec/samsao_config_spec.rb

@@ -8,7 +8,11 @@ module Danger
         @plugin = @dangerfile.samsao
       end
 
-      describe 'samsao_config' do
+      describe 'config sources' do
+        it 'defaults to empty array when not set' do
+          expect(@plugin.config.sources).to eq([])
+        end
+
         it 'can configure single source' do
           @plugin.config do
             sources 'app/src'
@@ -25,6 +29,56 @@ module Danger
           expect(@plugin.config.sources).to eq(['app/src', 'lib/src'])
         end
       end
+
+      describe 'config changelogs' do
+        it 'defaults to [CHANGELOG.md] array when not set' do
+          expect(@plugin.config.changelogs).to eq(['CHANGELOG.md'])
+        end
+
+        it 'can configure single changelog' do
+          @plugin.config do
+            changelogs 'a'
+          end
+
+          expect(@plugin.config.changelogs).to eq(['a'])
+        end
+
+        it 'can configure multiple changelogs' do
+          @plugin.config do
+            changelogs 'a', 'b'
+          end
+
+          expect(@plugin.config.changelogs).to eq(['a', 'b'])
+        end
+      end
+
+      describe 'config project_type' do
+        it 'defaults to :application when not set' do
+          expect(@plugin.config.project_type).to eq(:application)
+        end
+
+        [:application, :library].each do |type|
+          it "accepts :#{type} type" do
+            @plugin.config do
+              project_type type
+            end
+
+            expect(@plugin.config.project_type).to eq(type)
+          end
+        end
+
+        it 'rejects invalid types when wrong type is a symbol' do
+          message = "Project type ':custom' is invalid, must be one of ':application, :library'"
+
+          expect { @plugin.config { project_type :custom } }.to raise_error(message)
+        end
+
+        it 'rejects invalid types when wrong type is a string' do
+          message = "Project type 'custom' is invalid, must be one of ':application, :library'"
+
+          expect { @plugin.config { project_type 'custom' } }.to raise_error(message)
+        end
+      end
     end
   end
 end

data/spec/samsao_trivial_change_spec.rb

@@ -12,45 +12,31 @@ module Danger
       end
 
       describe 'trivial_change?' do
-        ['#trivial', '#typo'].each do |marker|
+        ['#trivial', '#typo', '#typos'].each do |marker|
           it "returns true when PR title contains #{marker} at the end" do
-            allow(@plugin.github).to receive(:pr_title).and_return("Trivial at the end #{marker}")
+            allow(@plugin.github).to receive(:pr_title).and_return("Marker at the end #{marker}")
 
             expect(@plugin.trivial_change?).to be(true)
           end
 
           it "returns true when PR title contains #{marker} at the start" do
-            allow(@plugin.github).to receive(:pr_title).and_return("#{marker} Trivial at the start")
+            allow(@plugin.github).to receive(:pr_title).and_return("#{marker} Marker at the start")
 
             expect(@plugin.trivial_change?).to be(true)
           end
 
           it "returns true when PR title contains #{marker} in the middle" do
-            allow(@plugin.github).to receive(:pr_title).and_return("Trivial in #{marker} the middle")
-
-            expect(@plugin.trivial_change?).to be(true)
-          end
-
-          it "returns true when branch is a trivial branch and PR include #{marker}" do
-            allow(@plugin.github).to receive(:branch_for_head).and_return('trivial/a')
-            allow(@plugin.github).to receive(:pr_title).and_return("##{marker}")
+            allow(@plugin.github).to receive(:pr_title).and_return("Marker in #{marker} the middle")
 
             expect(@plugin.trivial_change?).to be(true)
           end
         end
 
-        it 'returns false when not trivial branch and no trivial marker(s) in PR title' do
-          allow(@plugin.github).to receive(:branch_for_head).and_return('feature/a')
+        it 'returns false no trivial marker(s) in PR title' do
           allow(@plugin.github).to receive(:pr_title).and_return('Something')
 
           expect(@plugin.trivial_change?).to be(false)
         end
-
-        it 'returns true when branch is a trivial branch' do
-          allow(@plugin.github).to receive(:branch_for_head).and_return('trivial/a')
-
-          expect(@plugin.trivial_change?).to be(true)
-        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-samsao
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Samsao Development Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- Dangerfile
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -206,9 +207,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="