fastlane-plugin-changelog_generator 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67daa454054c49d43152b86f2738ef1e5d52ec91
-  data.tar.gz: f8c16f08af744b4d7052c61ef56e7776929e6f55
+  metadata.gz: 741359874cb09cf98217125eb8fa4f170feba154
+  data.tar.gz: 1c2c405f51e39405a19c2af10e240ca85b264785
 SHA512:
-  metadata.gz: 8e80c8bd71f77a33ef6e5b4441b3741c662877e11e1b910e0e4fc4c51bb18b8fbe55c983e180761754469921e6e734640a0211a578d3a15c4de777ea0a218675
-  data.tar.gz: 68a5ed0387357f6bbd8a745e89007111e8362b55f433b6bcb327b636b7c129923dd20d5fdd75f0eb54b4b6d5de7aa2644a49d9f43e126f59c54705f2497ab172
+  metadata.gz: 3fa0a3bddd0ac73e747eca18d9d5005497eb360c0fcac1b6c9ed7b282e1bc13136a343275c23268660da4b7699cb06e394018e36fb1a48a38dbda1ec326126e5
+  data.tar.gz: e3b3c7e422bd8739bae4ee5c8d7bd11805fbd26efea912fda0f402d59e38e6c2ef708beee282bce2f44db23a5f6e8b4a81b8eeb1acee0673688f1e5649e885f9

data/lib/fastlane/plugin/changelog_generator/actions/generate_changelog_action.rb

@@ -2,12 +2,10 @@ module Fastlane
   module Actions
     class GenerateChangelogAction < Action
       def self.run(params)
-        labels, pull_requests = other_action.fetch_github_labels(github_project: params[:github_project],
-                                                                 base_branch: params[:base_branch],
-                                                                 github_api_token: params[:github_api_token])
+        labels, pull_requests = Helper::ChangelogGeneratorFetcher.fetch_github_data(params, lane_context)
 
         tag_limit = params[:max_number_of_tags]
-        tags = params[:tags] || other_action.git_tags(limit: tag_limit)
+        tags = params[:tags] || Helper::ChangelogGeneratorHelper.git_tags(tag_limit)
         releases = []
 
         # Unreleased section

data/lib/fastlane/plugin/changelog_generator/actions/generate_release_changelog_action.rb

@@ -8,9 +8,7 @@ module Fastlane
           tag_b = prompt_tag("Please enter second tag: ", [tag_a], true)
         end
 
-        labels, pull_requests = other_action.fetch_github_labels(github_project: params[:github_project],
-                                                                 base_branch: params[:base_branch],
-                                                                 github_api_token: params[:github_api_token])
+        labels, pull_requests = Helper::ChangelogGeneratorFetcher.fetch_github_data(params, lane_context)
 
         release = Helper::ChangelogGeneratorRelease.new(labels, pull_requests, tag_b, tag_a)
         Helper::ChangelogGeneratorRender.new([release], labels, params).to_markdown
@@ -18,10 +16,16 @@ module Fastlane
 
       def self.prompt_tag(message = '', excluded_tags = [], allow_none = false)
         no_tag_text = 'No tag'
+        other_tag_text = 'Enter tag manually'
+        tag_limit = 10
 
-        available_tags = other_action.git_tags(limit: 10)
+        available_tags = Helper::ChangelogGeneratorHelper.git_tags
         available_tags.reject! { |tag| excluded_tags.include?(tag) }
+        tags_count = available_tags.count
+
+        available_tags = available_tags.take(tag_limit)
         available_tags << no_tag_text if allow_none
+        available_tags << other_tag_text if tags_count > tag_limit
 
         if allow_none && available_tags.count == 1
           UI.important("Skiping second tag because there are no tags available.")
@@ -30,6 +34,7 @@ module Fastlane
 
         tag = UI.select(message, available_tags)
         tag = nil if tag == no_tag_text
+        tag = UI.input('Tag: ') if tag == other_tag_text
         tag
       end
 

data/lib/fastlane/plugin/changelog_generator/helper/changelog_generator_fetcher.rb

@@ -3,11 +3,26 @@ require 'octokit'
 module Fastlane
   module Helper
     class ChangelogGeneratorFetcher
-      def self.fetch_labels(project, base_branch, access_token)
-        Actions.verify_gem!('octokit')
+      module SharedValues
+        GENERATE_CHANGELOG_GITHUB_LABELS = :GENERATE_CHANGELOG_GITHUB_LABELS
+        GENERATE_CHANGELOG_GITHUB_PULL_REQUESTS = :GENERATE_CHANGELOG_GITHUB_PULL_REQUESTS
+      end
 
+      def self.fetch_github_data(params, lane_context)
+        Actions.verify_gem!('octokit')
         Octokit.auto_paginate = true
 
+        labels = lane_context[SharedValues::GENERATE_CHANGELOG_GITHUB_LABELS]
+        pull_requests = lane_context[SharedValues::GENERATE_CHANGELOG_GITHUB_PULL_REQUESTS]
+        if labels && pull_requests
+          UI.important "Skipping API call because labels & pull requests are cached"
+          return labels, pull_requests
+        end
+
+        project = params[:github_project]
+        base_branch = params[:base_branch]
+        access_token = params[:github_api_token]
+
         issues_map = {}
         Octokit.issues(project, state: 'closed', access_token: access_token).each do |issue|
           issues_map[issue.number] = issue
@@ -32,6 +47,9 @@ module Fastlane
           pr.label_ids = issues_map[pr.number].labels.map(&:id)
         end
 
+        lane_context[SharedValues::GENERATE_CHANGELOG_GITHUB_LABELS] = labels
+        lane_context[SharedValues::GENERATE_CHANGELOG_GITHUB_PULL_REQUESTS] = pull_requests
+
         return labels, pull_requests
       end
     end

data/lib/fastlane/plugin/changelog_generator/helper/changelog_generator_helper.rb

@@ -1,11 +1,10 @@
 module Fastlane
   module Helper
     class ChangelogGeneratorHelper
-      # class methods that you define here become available in your action
-      # as `Helper::ChangelogGeneratorHelper.your_method`
-      #
-      def self.show_message
-        UI.message("Hello from the changelog_generator plugin helper!")
+      def self.git_tags(limit = nil)
+        tags = `git tag --sort=taggerdate`.split("\n").reverse
+        tags = tags.take(limit) if limit
+        tags
       end
     end
   end

data/lib/fastlane/plugin/changelog_generator/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module ChangelogGenerator
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-changelog_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Fernando Saragoca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -117,10 +117,8 @@ files:
 - LICENSE
 - README.md
 - lib/fastlane/plugin/changelog_generator.rb
-- lib/fastlane/plugin/changelog_generator/actions/fetch_github_labels_action.rb
 - lib/fastlane/plugin/changelog_generator/actions/generate_changelog_action.rb
 - lib/fastlane/plugin/changelog_generator/actions/generate_release_changelog_action.rb
-- lib/fastlane/plugin/changelog_generator/actions/git_tags_action.rb
 - lib/fastlane/plugin/changelog_generator/helper/changelog_generator_fetcher.rb
 - lib/fastlane/plugin/changelog_generator/helper/changelog_generator_helper.rb
 - lib/fastlane/plugin/changelog_generator/helper/changelog_generator_release.rb

data/lib/fastlane/plugin/changelog_generator/actions/fetch_github_labels_action.rb

@@ -1,70 +0,0 @@
-module Fastlane
-  module Actions
-    class FetchGithubLabelsAction < Action
-      module SharedValues
-        GENERATE_CHANGELOG_GITHUB_LABELS = :GENERATE_CHANGELOG_GITHUB_LABELS
-        GENERATE_CHANGELOG_GITHUB_PULL_REQUESTS = :GENERATE_CHANGELOG_GITHUB_PULL_REQUESTS
-      end
-
-      def self.run(params)
-        Actions.verify_gem!('octokit')
-
-        labels = lane_context[SharedValues::GENERATE_CHANGELOG_GITHUB_LABELS]
-        pull_requests = lane_context[SharedValues::GENERATE_CHANGELOG_GITHUB_PULL_REQUESTS]
-        if labels && pull_requests
-          UI.important "Skipping API call because labels & pull requests are cached"
-          return labels, pull_requests
-        end
-
-        api_token = params[:github_api_token]
-        base_branch = params[:base_branch]
-        project = params[:github_project]
-
-        labels, pull_requests = Helper::ChangelogGeneratorFetcher.fetch_labels(project,
-                                                                               base_branch,
-                                                                               api_token)
-        lane_context[SharedValues::GENERATE_CHANGELOG_GITHUB_LABELS] = labels
-        lane_context[SharedValues::GENERATE_CHANGELOG_GITHUB_PULL_REQUESTS] = pull_requests
-        return labels, pull_requests
-      end
-
-      def output
-        [
-          ['GENERATE_CHANGELOG_GITHUB_LABELS', 'Fetched GitHub labels'],
-          ['GENERATE_CHANGELOG_GITHUB_PULL_REQUESTS', 'Fetched GitHub pull requests']
-        ]
-      end
-
-      def self.description
-        "Fetches GitHub for labels & merged pull requests"
-      end
-
-      def self.authors
-        ["Fernando Saragoca"]
-      end
-
-      def self.return_value
-        "A tuple with an array of labels & an array of pull requests"
-      end
-
-      def self.available_options
-        [
-          FastlaneCore::ConfigItem.new(key: :github_project,
-                                       env_name: 'GENERATE_CHANGELOG_GITHUB_PROJECT',
-                                       description: 'GitHub project name, including organization'),
-          FastlaneCore::ConfigItem.new(key: :github_api_token,
-                                       env_name: 'GENERATE_CHANGELOG_GITHUB_API_TOKEN',
-                                       description: 'API token to access GitHub API',
-                                       default_value: ENV["GITHUB_API_TOKEN"]),
-          FastlaneCore::ConfigItem.new(key: :base_branch,
-                                       env_name: 'GENERATE_CHANGELOG_BASE_BRANCH',
-                                       description: 'Base branch for pull requests')
-        ]
-      end
-
-      def self.is_supported?(platform)
-        true
-      end
-    end
-  end
-end

data/lib/fastlane/plugin/changelog_generator/actions/git_tags_action.rb

@@ -1,37 +0,0 @@
-module Fastlane
-  module Actions
-    class GitTagsAction < Action
-      def self.run(params)
-        tags = `git tag --sort=taggerdate`.split("\n").reverse
-        tags = tags.take(params[:limit]) if params[:limit]
-        tags
-      end
-
-      def self.description
-        "Git tags sorted by taggerdate"
-      end
-
-      def self.authors
-        ["Fernando Saragoca"]
-      end
-
-      def self.return_value
-        "Array of git tags sorted by taggerdate"
-      end
-
-      def self.available_options
-        [
-          FastlaneCore::ConfigItem.new(key: :limit,
-                                       env_name: 'GIT_TAGS_LIMIT',
-                                       description: 'Limit number of tags to return',
-                                       is_string: false,
-                                       optional: true)
-        ]
-      end
-
-      def self.is_supported?(platform)
-        true
-      end
-    end
-  end
-end