groundskeeper-bitcore 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5226b29a0e4aca883b307266416d0e2fe9a03418
-  data.tar.gz: d2389f396c568033925b7ecab7d858239a518924
+SHA256:
+  metadata.gz: 00e0b4315f9ae98ccb690863405a89c7e7635270eb8b6a649a0a5af5dcdde8da
+  data.tar.gz: 7bfda8e17853c7ab6c07277126321505d08f7730d94c15d531a934d6efdaaddf
 SHA512:
-  metadata.gz: 73c185b483f7ef22a19904c79c58cd9d7ff5681fc5c29987c85014bf32a31cfdf0a770cbc23eede4ccd8285df8ce26f1a88b4e323f404ce096064a84a6f18c71
-  data.tar.gz: f38b7f11652c93e865decd469f0f879c83caf67793ca8a41244d950025a9135aa783d6206a59361e840f99652d8cc6f62c27e68d9acf43519a2d1f26fbbfd532
+  metadata.gz: 6242b40a508edc424b897adab0a59368f97085aeb44154805e2fdca64af4b5e3aa923e6a3a99640c90d2b2f68a0d6bda5eca8c34ce31e34330fa1631d1fa58ed
+  data.tar.gz: 7866a3d902dc07495868a718cc32215876423862df2da04472e08b3b60f90c10146744f478306dd91ce552564cb8b6df2522b1e2ad4f0e5059e530ffde72895f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.5 - 2019-02-20
+
+* GROUN-25 update RuboCop and fix warnings (#92)
+* GROUN-10 avoid overwriting files on predeploy unless specified with force_overwrite=true (#90)
+
 ## 0.3.4 - 2019-01-04
 
 * GROUN-21 format virtual host and Rails config files nicely (#88)

data/config/git_config.rb

@@ -32,10 +32,12 @@ task :before_run do
   puts "Looking up tags for project #{application}... (#{project.repo_url})"
   tags = project.tags
   raise "There must be a tagged release prior to deploying." if tags.count.zero?
+
   tag = ENV["tag"]
   unless tags.include? tag
     raise "Tag \"#{tag}\" not found. Available tags:\n #{tags.join("\n")}"
   end
+
   set :branch, "master"
   set :tag, "tags/#{tag}"
 end

data/config/predeploy.rb

@@ -36,6 +36,8 @@ def active_storage_dir
   "#{fetch :deploy_to}/shared/storage"
 end
 
+FORCE_OVERWRITE = ENV["force_overwrite"]
+
 # rubocop:disable Metrics/BlockLength
 namespace :deploy_configure do
   desc "Create database and secrets"
@@ -48,7 +50,7 @@ namespace :deploy_configure do
     rails_config = load_template("rails_config.rb.erb")
 
     run :remote do
-      command "mkdir -p #{environments_dir}"
+      command "mkdir -p #{environments_dir}" unless File.exist? environments_dir
     end
 
     if File.exist? "./config/secrets.yml"
@@ -58,22 +60,30 @@ namespace :deploy_configure do
     comment "Writing staging secrets to #{secrets_config_file}"
     comment "touch #{secrets_config_file}"
     run :remote do
-      command "echo \"#{secrets_config}\" >> #{secrets_config_file}"
+      if !(File.exist? secrets_config_file) || FORCE_OVERWRITE
+        command "echo \"#{secrets_config}\" >> #{secrets_config_file}"
+      end
     end
 
     comment "Writing database config to #{database_config_file}"
     run :remote do
-      command "echo \"#{db_config}\" > #{database_config_file}"
+      if !(File.exist? database_config_file) || FORCE_OVERWRITE
+        command "echo \"#{db_config}\" > #{database_config_file}"
+      end
     end
 
     comment "Writing Rails config to #{rails_config_file}"
     run :remote do
-      command "echo \"#{rails_config}\" > #{rails_config_file}"
+      if !(File.exist? rails_config_file) || FORCE_OVERWRITE
+        command "echo \"#{rails_config}\" > #{rails_config_file}"
+      end
     end
 
     comment "Creating storage directory #{active_storage_dir}"
     run :remote do
-      command "mkdir -p #{active_storage_dir}"
+      if !(File.exist? active_storage_dir) || FORCE_OVERWRITE
+        command "mkdir -p #{active_storage_dir}"
+      end
     end
   end
 
@@ -82,8 +92,10 @@ namespace :deploy_configure do
     path = remote_shared_path("config/secrets.yml")
     comment "Copying secrets.yml to #{path}."
     run :local do
-      command = "scp ./config/secrets.yml #{path}"
-      puts `#{command}`
+      if !(File.exist? path) || FORCE_OVERWRITE
+        command = "scp ./config/secrets.yml #{path}"
+        puts `#{command}`
+      end
     end
   end
 end
@@ -94,9 +106,10 @@ namespace :deploy_prepare do
   task :create_vhost do
     load_project
     vhost_config = load_template("vhost_config.conf.erb")
-
-    comment "Writing virtual host config to #{vhost_config_file}"
-    command "echo \"#{vhost_config}\" > #{vhost_config_file}"
+    if !(File.exist? vhost_config_file) || FORCE_OVERWRITE
+      comment "Writing virtual host config to #{vhost_config_file}"
+      command "echo \"#{vhost_config}\" > #{vhost_config_file}"
+    end
   end
 
   desc "Configure Postgres."

data/groundskeeper.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "groundskeeper/version"
 
@@ -33,13 +32,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib config]
 
   spec.add_dependency "jira-ruby", "~> 1.3"
-  spec.add_dependency "thor", "~> 0.19"
   spec.add_dependency "mina", "~> 1.2"
   spec.add_dependency "mina-whenever", "~> 1.0.1"
+  spec.add_dependency "thor", "~> 0.19"
 
   spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rubocop", "~> 0.49.1"
+  spec.add_development_dependency "rubocop", "~> 0.63"
   spec.add_development_dependency "simplecov", "~> 0.14"
-  spec.add_development_dependency "byebug"
 end

data/lib/groundskeeper/commands.rb

@@ -89,6 +89,7 @@ module Groundskeeper
     def info(options = {})
       return unrecognized_version unless version_file.exists?
       return unless check_groundskeeper_version
+
       Executable.verbose = options[:verbose]
       pull_project_details
 
@@ -137,6 +138,7 @@ module Groundskeeper
     def predeploy(options = {})
       return unrecognized_version unless version_file.exists?
       return unless check_groundskeeper_version
+
       Executable.verbose = options[:verbose]
       pull_project_details
 
@@ -152,6 +154,7 @@ module Groundskeeper
       return missing_jira_credentials unless jira.credentials?
       return missing_sentry_credentials unless sentry.credentials?
       return unless check_groundskeeper_version
+
       Executable.verbose = options[:verbose]
       pull_project_details
       ENV["whenever"] = "1" if project.uses_whenever?
@@ -387,10 +390,12 @@ module Groundskeeper
       end
     end
 
+    # :nocov:
     def release_version
       jira.release_version(project, website.version)
       console.say("#{project.repo_name} #{website.version} released", :green)
     end
+    # :nocov:
 
     def transition_remote_issues(version)
       version_name = "#{repository.name} #{version}"

data/lib/groundskeeper/git.rb

@@ -10,8 +10,10 @@ module Groundskeeper
     VERSION = "--version"
     TAGS_ASC = "tag -l --sort=v:refname"
     LATEST_TAG_COMMIT = "#{COMMAND} rev-list --tags --max-count=1"
-    LATEST_TAG_NAME = format("describe --tags $(%s)", LATEST_TAG_COMMIT)
-    LATEST_TAG_BRANCHES = format("branch --contains $(%s)", LATEST_TAG_COMMIT)
+    LATEST_TAG_NAME =
+      format("describe --tags $(%<commit>s)", commit: LATEST_TAG_COMMIT)
+    LATEST_TAG_BRANCHES =
+      format("branch --contains $(%<commit>s)", commit: LATEST_TAG_COMMIT)
     LATEST_CHANGES = "log %s..HEAD --oneline"
     CREATE_AND_CHECKOUT_BRANCH = "checkout -b %s"
     ADD_UPDATE = "add -u"

data/lib/groundskeeper/jira.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "cgi"
 require "date"
 require "jira-ruby"
 
@@ -64,9 +65,9 @@ module Groundskeeper
       # :nocov:
       def fetch_issues_by_fix_version(version:)
         search_path = "/rest/api/2/search"
-        query = "fixVersion = \"#{version}\""
+        query = "fixVersion=#{version}"
         response =
-          client.get("#{search_path}?fields=key&jql=#{URI.escape(query)}").body
+          client.get("#{search_path}?fields=key&jql=#{CGI.escape(query)}").body
 
         JSON.parse(response)["issues"].map { |issue| issue["key"] }
       end

data/lib/groundskeeper/rails_version.rb

@@ -5,11 +5,11 @@ module Groundskeeper
   class RailsVersion
     APPLICATION_CONFIG_FILE = "%sconfig/application.rb"
     INITIAL_VERSION = "0.0.0"
-    MODULE_NAME_EXPRESSION = /module (\w+)/
+    MODULE_NAME_EXPRESSION = /module (\w+)/.freeze
     NAMESPACE_FILE = "%slib/%s.rb"
     MODULE_DIRECTORY = "%slib/%s"
     VERSION_FILE = "#{MODULE_DIRECTORY}/version.rb"
-    VERSION_EXPRESSION = /(?<=VERSION = ")([^"]+)(?=")/
+    VERSION_EXPRESSION = /(?<=VERSION = ")([^"]+)(?=")/.freeze
 
     attr_reader :config_file, :namespace_file, :project_name, :relative_path,
                 :version_file

data/lib/groundskeeper/repository.rb

@@ -8,7 +8,7 @@ module Groundskeeper
     UP_TO_DATE = "Your branch is up-to-date with 'origin/master'"
     UNSTAGED_CHANGES = "Changes not staged for commit"
     # git comment matching
-    COMMIT_HASH = /^[^ ]+ /
+    COMMIT_HASH = /^[^ ]+ /.freeze
     RELEASE_MESSAGE = "release version %s"
 
     attr_reader :git

data/lib/groundskeeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Groundskeeper
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - BIT Core
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - certs/ericcf.pem
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby
@@ -26,47 +26,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: mina
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: mina
+  name: mina-whenever
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: mina-whenever
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,61 +82,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.63'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.63'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 description: 
 email:
 - ericcf@northwestern.edu
@@ -207,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A gem for managing releases and deployments.