pantograph 0.1.14 → 0.1.15

data/pantograph/lib/pantograph/actions/set_github_release.rb

@@ -157,10 +157,10 @@ module Pantograph
         [
           PantographCore::ConfigItem.new(key: :repository_name,
                                        env_name: 'SET_GITHUB_RELEASE_REPOSITORY_NAME',
-                                       description: "The path to your repo, e.g. 'pantograph/pantograph'",
+                                       description: "The path to your repo, e.g. 'johnknapprs/pantograph'",
                                        verify_block: proc do |value|
-                                         UI.user_error!("Please only pass the path, e.g. 'pantograph/pantograph'") if value.include?("github.com")
-                                         UI.user_error!("Please only pass the path, e.g. 'pantograph/pantograph'") if value.split('/').count != 2
+                                         UI.user_error!("Please only pass the path, e.g. 'johnknapprs/pantograph'") if value.include?("github.com")
+                                         UI.user_error!("Please only pass the path, e.g. 'johnknapprs/pantograph'") if value.split('/').count != 2
                                        end),
           PantographCore::ConfigItem.new(key: :server_url,
                                        env_name: 'GITHUB_RELEASE_SERVER_URL',
@@ -255,7 +255,7 @@ module Pantograph
       def self.example_code
         [
           'github_release = set_github_release(
-            repository_name: "pantograph/pantograph",
+            repository_name: "johnknapprs/pantograph",
             api_token: ENV["GITHUB_TOKEN"],
             name: "Super New actions",
             tag_name: "v1.22.0",

data/pantograph/lib/pantograph/actions/sh.rb

@@ -10,13 +10,13 @@ module Pantograph
       #####################################################
 
       def self.description
-        "Runs a shell command"
+        'Runs a shell command'
       end
 
       def self.details
         [
-          "Allows running an arbitrary shell command.",
-          "Be aware of a specific behavior of `sh` action with regard to the working directory. For details, refer to [Advanced](https://johnknapprs.github.io/pantograph/advanced/#directory-behavior)."
+          'Allows running an arbitrary shell command.',
+          'Be aware of a specific behavior of `sh` action with regard to the working directory. For details, refer to [Advanced](https://johnknapprs.github.io/pantograph/advanced/#directory-behavior).'
         ].join("\n")
       end
 

data/pantograph/lib/pantograph/commands_generator.rb

@@ -84,7 +84,7 @@ module Pantograph
       ].join("\n")
       program :help, 'Author', 'Felix Krause <pantograph@krausefx.com>'
       program :help, 'Website', 'https://pantograph.tools'
-      program :help, 'GitHub', 'https://github.com/pantograph/pantograph'
+      program :help, 'GitHub', 'https://github.com/johnknapprs/pantograph'
       program :help_formatter, :compact
 
       global_option('--verbose') { PantographCore::Globals.verbose = true }

data/pantograph/lib/pantograph/helper/git_helper.rb

@@ -132,4 +132,33 @@ module Pantograph
       end
     end
   end
+
+  module Helper
+    module Git
+      # Returns the current git branch - can be replaced using the environment variable `GIT_BRANCH`
+      def self.current_branch
+        return ENV['GIT_BRANCH'] if ENV['GIT_BRANCH'].to_s.length > 0 # set by Jenkins
+        s = Actions.sh("git rev-parse --abbrev-ref HEAD", log: false).chomp
+        return s.to_s.strip if s.to_s.length > 0
+        nil
+      rescue
+        nil
+      end
+
+      def self.repo_status
+        Actions.sh('git status --porcelain')
+      end
+
+      def self.repo_clean?
+        repo_status.empty?
+      end
+
+      def self.is_git?
+        Actions.sh('git rev-parse HEAD', log: false)
+        return true
+      rescue
+        UI.user_error!("Not in a git repository.")
+      end
+    end
+  end
 end

data/pantograph/lib/pantograph/lane_manager.rb

@@ -95,7 +95,7 @@ module Pantograph
       end
 
       if available.empty?
-        UI.user_error!("It looks like you don't have any lanes to run just yet. Check out how to get started here: https://github.com/pantograph/pantograph 🚀")
+        UI.user_error!("It looks like you don't have any lanes to run just yet. Check out how to get started here: https://github.com/johnknapprs/pantograph 🚀")
       end
 
       rows = []

data/pantograph/lib/pantograph/pant_file.rb

@@ -236,14 +236,18 @@ module Pantograph
     end
 
     def import(path = nil)
-      UI.user_error!("Please pass a path to the `import` action") unless path
+      if path.nil?
+        UI.user_error!("Please pass a path to the `import` action")
+      end
 
       path = path.dup.gsub("~", Dir.home)
       unless Pathname.new(path).absolute? # unless an absolute path
         path = File.join(File.expand_path('..', @path), path)
       end
 
-      UI.user_error!("Could not find Pantfile at path '#{path}'") unless File.exist?(path)
+      unless File.exist?(path)
+        UI.user_error!("Could not find Pantfile at path '#{path}'")
+      end
 
       # First check if there are local actions to import in the same directory as the Pantfile
       actions_path = File.join(File.expand_path("..", path), 'actions')
@@ -262,8 +266,10 @@ module Pantograph
     # @param branch [String] The branch to checkout in the repository
     # @param path [String] The path to the Pantfile
     # @param version [String, Array] Version requirement for repo tags
-    def import_from_git(url: nil, branch: 'HEAD', path: 'pantograph/Pantfile', version: nil)
-      UI.user_error!("Please pass a path to the `import_from_git` action") if url.to_s.length == 0
+    def import_from_git(url: nil, branch: 'master', path: 'pantograph/Pantfile', version: nil)
+      if url.to_s.length == 0
+        UI.user_error!("Please pass the git url to the `import_from_git` action")
+      end
 
       Actions.execute_action('import_from_git') do
         require 'tmpdir'
@@ -271,17 +277,15 @@ module Pantograph
         action_launched('import_from_git')
 
         # Checkout the repo
-        repo_name = url.split("/").last
+        repo_name      = url.split('/').last
         checkout_param = branch
 
-        Dir.mktmpdir("fl_clone") do |tmp_path|
+        Dir.mktmpdir('pant_clone') do |tmp_path|
           clone_folder = File.join(tmp_path, repo_name)
 
-          branch_option = "--branch #{branch}" if branch != 'HEAD'
-
-          UI.message("Cloning remote git repo...")
+          UI.message('Cloning remote git repo...')
           Helper.with_env_values('GIT_TERMINAL_PROMPT' => '0') do
-            Actions.sh("git clone #{url.shellescape} #{clone_folder.shellescape} --depth 1 -n #{branch_option}")
+            Actions.sh("git clone #{url.shellescape} #{clone_folder.shellescape} --depth 1 -n --branch #{branch}")
           end
 
           unless version.nil?
@@ -294,20 +298,22 @@ module Pantograph
           Actions.sh("cd #{clone_folder.shellescape} && git checkout #{checkout_param.shellescape} #{path.shellescape}")
 
           # We also want to check out all the local actions of this pantograph setup
-          containing = path.split(File::SEPARATOR)[0..-2]
-          containing = "." if containing.count == 0
+          containing     = path.split(File::SEPARATOR)[0..-2]
+          containing     = "." if containing.count == 0
           actions_folder = File.join(containing, "actions")
+
           begin
             Actions.sh("cd #{clone_folder.shellescape} && git checkout #{checkout_param.shellescape} #{actions_folder.shellescape}")
           rescue
             # We don't care about a failure here, as local actions are optional
           end
 
-          return_value = import(File.join(clone_folder, path))
-
-          action_completed('import_from_git', status: PantographCore::ActionCompletionStatus::SUCCESS)
+          import(File.join(clone_folder, path))
 
-          return return_value
+          action_completed(
+            'import_from_git',
+            status: PantographCore::ActionCompletionStatus::SUCCESS
+          )
         end
       end
     end

data/pantograph/lib/pantograph/plugins/template/README.md.erb

@@ -4,7 +4,7 @@
 
 ## Getting Started
 
-This project is a [_pantograph_](https://github.com/pantograph/pantograph) plugin. To get started with `<%= gem_name %>`, add it to your project by running:
+This project is a [_pantograph_](https://github.com/johnknapprs/pantograph) plugin. To get started with `<%= gem_name %>`, add it to your project by running:
 
 ```bash
 pantograph add_plugin <%= plugin_name %>

data/pantograph/lib/pantograph/setup/setup.rb

@@ -214,23 +214,12 @@ module Pantograph
 
     def suggest_next_steps
       UI.header("Where to go from here?")
-      if self.platform == :gradle
-        UI.message("📸  Learn more about how to automatically generate localized Google Play screenshots:")
-        UI.message("\t\thttps://johnknapprs.github.io/pantograph/getting-started/gradle/screenshots/".cyan)
-        UI.message("👩‍✈️  Learn more about distribution to beta testing services:")
-        UI.message("\t\thttps://johnknapprs.github.io/pantograph/getting-started/gradle/beta-deployment/".cyan)
-        UI.message("🚀  Learn more about how to automate the Google Play release process:")
-        UI.message("\t\thttps://johnknapprs.github.io/pantograph/getting-started/gradle/release-deployment/".cyan)
-      else
-        # UI.message("📸  Learn more about how to automatically generate localized App Store screenshots:")
-        # UI.message("\t\thttps://johnknapprs.github.io/pantograph/getting-started/mac/screenshots/".cyan)
-        UI.message("👩‍✈️  Learn more about distribution to beta testing services:")
-        UI.message("\t\thttps://johnknapprs.github.io/pantograph/getting-started/mac/beta-deployment/".cyan)
-        # UI.message("🚀  Learn more about how to automate the App Store release process:")
-        # UI.message("\t\thttps://johnknapprs.github.io/pantograph/getting-started/mac/appstore-deployment/".cyan)
-        # UI.message("👩‍⚕️  Learn more about how to setup code signing with pantograph")
-        # UI.message("\t\thttps://johnknapprs.github.io/pantograph/codesigning/getting-started/".cyan)
-      end
+      UI.message("📸  Learn more about Pantograph Official Actions")
+      UI.message("\t\thttps://johnknapprs.github.io/pantograph/actions/".cyan)
+      UI.message("👩‍✈️  Learn more about Pantograph Lane Features")
+      UI.message("\t\thttps://johnknapprs.github.io/pantograph/advanced/lanes/".cyan)
+      UI.message("🚀  Check out the entire documentation site for Pantograph")
+      UI.message("\t\thttps://johnknapprs.github.io/pantograph/".cyan)
 
       # we crash here, so that this never happens when a new setup method is added
       return if self.lane_to_mention.to_s.length == 0

data/pantograph/lib/pantograph/version.rb

@@ -1,5 +1,5 @@
 module Pantograph
-  VERSION             = '0.1.14'.freeze
+  VERSION             = '0.1.15'.freeze
   SUMMARY             = 'Another way to automate your apps'
   DESCRIPTION         = 'A way to automate your apps, forked from Fastlane'.freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/pantograph_core/lib/pantograph_core/configuration/commander_generator.rb

@@ -73,7 +73,7 @@ module PantographCore
         # Passing a nil value to global_option has been shown to create problems with
         # option parsing!
         #
-        # See: https://github.com/pantograph/pantograph_core/pull/89
+        # See: https://github.com/johnknapprs/pantograph_core/pull/89
         #
         # If we don't have a data type for this option, we tell it to act like a String.
         # This allows us to get a reasonable value for boolean options that can be

data/pantograph_core/lib/pantograph_core/globals.rb

@@ -20,8 +20,7 @@ module PantographCore
     end
 
     def self.verbose?
-      return nil unless @verbose
-      return true
+      @verbose ? true : nil
     end
   end
 end

data/pantograph_core/lib/pantograph_core/helper.rb

@@ -67,16 +67,29 @@ module PantographCore
     # @return [boolean] true if building in a known CI environment
     def self.ci?
       # Check for Jenkins, Travis CI, ... environment variables
-      ['JENKINS_HOME', 'JENKINS_URL', 'TRAVIS', 'CIRCLECI', 'CI', 'APPCENTER_BUILD_ID', 'TEAMCITY_VERSION', 'GO_PIPELINE_NAME', 'bamboo_buildKey', 'GITLAB_CI', 'XCS', 'TF_BUILD', 'GITHUB_ACTION', 'GITHUB_ACTIONS'].each do |current|
-        return true if ENV.key?(current)
-      end
-      return false
+      ci_vars = [
+        'JENKINS_HOME',
+        'JENKINS_URL',
+        'TRAVIS',
+        'CIRCLECI',
+        'CI',
+        'APPCENTER_BUILD_ID',
+        'TEAMCITY_VERSION',
+        'GO_PIPELINE_NAME',
+        'bamboo_buildKey',
+        'GITLAB_CI', 'XCS',
+        'TF_BUILD',
+        'GITHUB_ACTION',
+        'GITHUB_ACTIONS'
+      ]
+
+      ci_vars.any? { |var| ENV.key?(var) }
     end
 
     def self.operating_system
-      return "macOS" if RUBY_PLATFORM.downcase.include?("darwin")
+      return "macOS"   if RUBY_PLATFORM.downcase.include?("darwin")
       return "Windows" if RUBY_PLATFORM.downcase.include?("mswin")
-      return "Linux" if RUBY_PLATFORM.downcase.include?("linux")
+      return "Linux"   if RUBY_PLATFORM.downcase.include?("linux")
       return "Unknown"
     end
 

data/pantograph_core/lib/pantograph_core/ui/implementations/shell.rb

@@ -119,10 +119,7 @@ module PantographCore
     #####################################################
 
     def interactive?
-      interactive = true
-      interactive = false if $stdout.isatty == false
-      interactive = false if Helper.ci?
-      return interactive
+      ($stdout.isatty == false || Helper.ci?) ? false : true
     end
 
     def input(message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pantograph
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - John Knapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -132,6 +132,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: danger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
@@ -731,10 +745,10 @@ files:
 - pantograph/lib/pantograph/actions/ensure_git_status_clean.rb
 - pantograph/lib/pantograph/actions/erb.rb
 - pantograph/lib/pantograph/actions/get_github_release.rb
-- pantograph/lib/pantograph/actions/git_add.rb
 - pantograph/lib/pantograph/actions/git_branch.rb
 - pantograph/lib/pantograph/actions/git_commit.rb
 - pantograph/lib/pantograph/actions/git_pull.rb
+- pantograph/lib/pantograph/actions/git_pull_tags.rb
 - pantograph/lib/pantograph/actions/git_submodule_update.rb
 - pantograph/lib/pantograph/actions/git_tag_exists.rb
 - pantograph/lib/pantograph/actions/github_api.rb
@@ -742,17 +756,17 @@ files:
 - pantograph/lib/pantograph/actions/import.rb
 - pantograph/lib/pantograph/actions/import_from_git.rb
 - pantograph/lib/pantograph/actions/is_ci.rb
+- pantograph/lib/pantograph/actions/is_verbose.rb
 - pantograph/lib/pantograph/actions/jira.rb
 - pantograph/lib/pantograph/actions/lane_context.rb
 - pantograph/lib/pantograph/actions/last_git_commit.rb
-- pantograph/lib/pantograph/actions/make_changelog_from_jenkins.rb
 - pantograph/lib/pantograph/actions/min_pantograph_version.rb
-- pantograph/lib/pantograph/actions/nexus_upload.rb
 - pantograph/lib/pantograph/actions/number_of_commits.rb
 - pantograph/lib/pantograph/actions/opt_out_usage.rb
 - pantograph/lib/pantograph/actions/pantograph_version.rb
 - pantograph/lib/pantograph/actions/println.rb
 - pantograph/lib/pantograph/actions/prompt.rb
+- pantograph/lib/pantograph/actions/prompt_secure.rb
 - pantograph/lib/pantograph/actions/push_git_tags.rb
 - pantograph/lib/pantograph/actions/push_to_git_remote.rb
 - pantograph/lib/pantograph/actions/puts.rb

data/pantograph/lib/pantograph/actions/git_add.rb

@@ -1,93 +0,0 @@
-module Pantograph
-  module Actions
-    class GitAddAction < Action
-      def self.run(params)
-        should_escape = params[:shell_escape]
-
-        if params[:pathspec]
-          paths = params[:pathspec]
-          success_message = "Successfully added from \"#{paths}\" 💾."
-        elsif params[:path]
-          if params[:path].kind_of?(String)
-            paths = shell_escape(params[:path], should_escape)
-          elsif params[:path].kind_of?(Array)
-            paths = params[:path].map do |p|
-              shell_escape(p, should_escape)
-            end.join(' ')
-          end
-          success_message = "Successfully added \"#{paths}\" 💾."
-        else
-          paths = "."
-          success_message = "Successfully added all files 💾."
-        end
-
-        result = Actions.sh("git add #{paths}", log: PantographCore::Globals.verbose?).chomp
-        UI.success(success_message)
-        return result
-      end
-
-      def self.shell_escape(path, should_escape)
-        path = path.shellescape if should_escape
-        path
-      end
-
-      #####################################################
-      # @!group Documentation
-      #####################################################
-
-      def self.description
-        "Directly add the given file or all files"
-      end
-
-      def self.available_options
-        [
-          PantographCore::ConfigItem.new(key: :path,
-                                       description: "The file(s) and path(s) you want to add",
-                                       is_string: false,
-                                       conflicting_options: [:pathspec],
-                                       optional: true),
-          PantographCore::ConfigItem.new(key: :shell_escape,
-                                       description: "Shell escapes paths (set to false if using wildcards or manually escaping spaces in :path)",
-                                       is_string: false,
-                                       default_value: true,
-                                       optional: true),
-          # Deprecated
-          PantographCore::ConfigItem.new(key: :pathspec,
-                                       description: "The pathspec you want to add files from",
-                                       type: String,
-                                       conflicting_options: [:path],
-                                       optional: true,
-                                       deprecated: "Use `--path` instead")
-        ]
-      end
-
-      def self.return_value
-        nil
-      end
-
-      def self.authors
-        ["4brunu", "antondomashnev"]
-      end
-
-      def self.is_supported?(platform)
-        true
-      end
-
-      def self.example_code
-        [
-          'git_add',
-          'git_add(path: "./version.txt")',
-          'git_add(path: ["./version.txt", "./changelog.txt"])',
-          'git_add(path: "./Frameworks/*", shell_escape: false)',
-          'git_add(path: ["*.h", "*.m"], shell_escape: false)',
-          'git_add(path: "./Frameworks/*", shell_escape: false)',
-          'git_add(path: "*.txt", shell_escape: false)'
-        ]
-      end
-
-      def self.category
-        :source_control
-      end
-    end
-  end
-end

data/pantograph/lib/pantograph/actions/make_changelog_from_jenkins.rb

@@ -1,81 +0,0 @@
-module Pantograph
-  module Actions
-    module SharedValues
-      PANT_CHANGELOG ||= :PANT_CHANGELOG # originally defined in ChangelogFromGitCommitsAction
-    end
-
-    class MakeChangelogFromJenkinsAction < Action
-      def self.run(params)
-        require 'json'
-        require 'net/http'
-
-        changelog = ""
-
-        if Helper.ci? || Helper.test?
-          # The "BUILD_URL" environment variable is set automatically by Jenkins in every build
-          jenkins_api_url = URI(ENV["BUILD_URL"] + "api/json\?wrapper\=changes\&xpath\=//changeSet//comment")
-          begin
-            json = JSON.parse(Net::HTTP.get(jenkins_api_url))
-            json['changeSet']['items'].each do |item|
-              comment = params[:include_commit_body] ? item['comment'] : item['msg']
-              changelog << comment.strip + "\n"
-            end
-          rescue => ex
-            UI.error("Unable to read/parse changelog from jenkins: #{ex.message}")
-          end
-        end
-
-        Actions.lane_context[SharedValues::PANT_CHANGELOG] = changelog.strip.length > 0 ? changelog : params[:fallback_changelog]
-      end
-
-      def self.description
-        'Generate a changelog using the Changes section from the current Jenkins build'
-      end
-
-      def self.details
-        'This is useful when deploying automated builds. The changelog from Jenkins lists all the commit messages since the last build.'
-      end
-
-      def self.available_options
-        [
-          PantographCore::ConfigItem.new(key: :fallback_changelog,
-                                       description: 'Fallback changelog if there is not one on Jenkins, or it could not be read',
-                                       optional: true,
-                                       default_value: ''),
-          PantographCore::ConfigItem.new(key: :include_commit_body,
-                                       description: 'Include the commit body along with the summary',
-                                       optional: true,
-                                       is_string: false,
-                                       default_value: true)
-        ]
-      end
-
-      def self.output
-        [
-          ['PANT_CHANGELOG', 'The changelog generated by Jenkins']
-        ]
-      end
-
-      def self.authors
-        ['mandrizzle']
-      end
-
-      def self.is_supported?(platform)
-        true
-      end
-
-      def self.example_code
-        [
-          'make_changelog_from_jenkins(
-            # Optional, lets you set a changelog in the case is not generated on Jenkins or if ran outside of Jenkins
-            fallback_changelog: "Bug fixes and performance enhancements"
-          )'
-        ]
-      end
-
-      def self.category
-        :misc
-      end
-    end
-  end
-end