renuo-cli 0.0.13 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: adca29c33ee3aac89d50a5caf15553d14e4ae8e5bc42c141077d4ee6871218e8
-  data.tar.gz: 6ab51df5e5254b1d3662bb1623fdfe2bf57a4dde522559c7a91397e904ab9782
+SHA1:
+  metadata.gz: 41b05b933185d067661c4c49c8705d9fc0307300
+  data.tar.gz: 07f8c22d60a2ef4f42fe1a56662e83b163876db5
 SHA512:
-  metadata.gz: b7ad94fe437809b62be431f1862c7f6d02baa55a85deeca1f855e9ce378c4c17461c7cfc91514d283a3f2417c9167a37d44f404bc32e40c00c5a5e3ecc68118f
-  data.tar.gz: 6b6b7c62cdeba54b28abff6e57e30a3ee26299c7becea5ca05784f8220f7d78fbaebdadcb25cdefca76d2b9c422854da439ec3a1293420e0fd3218efcb6952b9
+  metadata.gz: db13152572f6e31b41868b4f7c0d404b5377b1ecae20d56e98bde27d922e343fc761c39cb41240e47e1b33b62e8dd1c65d15295c3afa57c076550e33913be33a
+  data.tar.gz: 3c5b4bfb4581dbafe2c639fbb1f4984757479dbbd6759a7f2bbb097136a491afbb34344efb5e3db1faaff56d3a9fcf231655b3914e51b5fc2dc70cda89989785

data/README.md

@@ -50,7 +50,7 @@ bundle install
 git commit -av
 git flow release finish [.....]
 git push origin develop:develop
-git push origin master:master
+git push origin master:master --tags
 git checkout master
 bundle exec rake release
 git checkout develop

data/bin/check

@@ -1,27 +1,23 @@
 #!/bin/sh
 
-
 if ! bundle exec rubocop -D -c .rubocop.yml
 then
   echo 'rubocop detected issues!'
   exit 1
 fi
 
-
 if ! bundle exec mdl .
 then
   echo 'Violated markdown rules, see https://github.com/mivok/markdownlint/blob/master/docs/RULES.md, commit aborted'
   exit 1
 fi
 
-
 if ! bundle exec rspec
 then
   echo 'rspec errors'
   exit 1
 fi
 
-
 if ! bundle exec cucumber
 then
   echo 'cucumber errors'

data/bin/run

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'renuo/cli'
+
+Renuo::CLI.new.start

data/lib/renuo/cli/app/create_aws_project.rb

@@ -76,21 +76,22 @@ class CreateAwsProject
     # wrap_at inserts newlines, after that, the command is no longer copyable
     # rubocop:disable Style/GlobalVars
     $terminal.wrap_at = nil
-    say aws_iam_setup(@aws_profile, @aws_region, aws_user(branch), @aws_app_group)
-    say tag_setup(aws_user(branch), @redmine_project)
-    say versioning_setup(@aws_profile, aws_user('master')) if branch == 'master'
-    cloudfront_setup(branch)
+    say aws_iam_setup(@aws_profile, aws_user(branch), @aws_app_group)
+    say aws_s3_setup(@aws_profile, aws_user(branch), @aws_region, @redmine_project)
+    say aws_s3_versioning_setup(@aws_profile, aws_user(branch)) if branch == 'master'
+    cloudfront_setup(aws_user(branch), branch)
     $terminal.wrap_at = :auto
     # rubocop:enable Style/GlobalVars
   end
 
-  def cloudfront_setup(branch)
+  def cloudfront_setup(bucket, branch)
     return unless @setup_cloudfront
-    say setup_cloudfront(@aws_profile, branch)
+    say aws_cloudfront_setup(@aws_profile, bucket, branch, @redmine_project)
     if @cloudfront_alias[branch.to_sym]
-      say "\nWarning: Don't forget to set up `#{cloudfront_alias(branch)}` on the DNS if not yet done".colorize :yellow
+      say "\n# Warning: Don't forget to set up `#{cloudfront_alias(branch)}` on the DNS "\
+          'if not yet done'.colorize :yellow
     else
-      say "\nHint: The domain name for your S3 files, can be found after running the" \
+      say "\n# Hint: The domain name for your S3 files, can be found after running the" \
           ' commands on https://console.aws.amazon.com/cloudfront/home'.colorize :yellow
     end
   end
@@ -103,35 +104,33 @@ class CreateAwsProject
     @cloudfront_alias[branch.to_sym]
   end
 
-  def aws_iam_setup(profile, region, user, app_group)
-    <<-SETUP_COMMANDS
+  def aws_iam_setup(profile, user, app_group)
+    <<-IAM_COMMANDS
       aws --profile #{profile} iam create-user --user-name #{user}
       aws --profile #{profile} iam add-user-to-group --user-name #{user} --group-name #{app_group}
       aws --profile #{profile} iam create-access-key --user-name #{user}
-      aws --profile #{profile} s3 mb s3://#{user} --region #{region}
-    SETUP_COMMANDS
+    IAM_COMMANDS
   end
 
-  def setup_cloudfront(profile, branch)
-    <<-SETUP_COMMANDS
-      aws cloudfront create-distribution --profile #{profile} --cli-input-json '#{cloudfront_config_string(aws_user(branch), branch)}'
-    SETUP_COMMANDS
+  def aws_s3_setup(profile, bucket, region, redmine_project)
+    <<-S3_COMMANDS
+      aws --profile #{profile} s3 mb s3://#{bucket} --region #{region}
+      aws --profile #{profile} s3api put-bucket-tagging --bucket #{bucket} --tagging "TagSet=[{Key=redmine_project,Value=#{redmine_project}}]"
+    S3_COMMANDS
   end
 
-  def versioning_setup(profile, bucket)
-    <<-VERSIONING_COMMANDS
+  def aws_s3_versioning_setup(profile, bucket)
+    <<-S3_VERSIONING_COMMANDS
       aws --profile #{profile} s3api put-bucket-versioning --bucket #{bucket} --versioning-configuration Status=Enabled
-    VERSIONING_COMMANDS
+    S3_VERSIONING_COMMANDS
   end
 
-  def tag_setup(bucket, redmine_project)
-    tag_set = "[{Key=redmine_project,Value=#{redmine_project}}]"
-    <<-TAGGING_COMMANDS
-      aws --profile #{@aws_profile} s3api put-bucket-tagging --bucket #{bucket} --tagging "TagSet=#{tag_set}"
-    TAGGING_COMMANDS
-  end
+  def aws_cloudfront_setup(profile, bucket, branch, redmine_project)
+    tags = [{ "redmine_project": redmine_project }]
+    cloudfront_config_string = CloudfrontConfigService.new(bucket, cloudfront_alias(branch), tags).to_s
 
-  def cloudfront_config_string(bucket, branch)
-    CloudfrontConfigService.new(bucket, cloudfront_alias(branch)).to_s
+    <<-CLOUDFRONT_COMMANDS
+      aws --profile #{profile} cloudfront create-distribution-with-tags --cli-input-json '#{cloudfront_config_string}'
+    CLOUDFRONT_COMMANDS
   end
 end

data/lib/renuo/cli/app/release_project.rb

@@ -16,8 +16,9 @@ class ReleaseProject
   end
 
   def validate_update_type(update_type, version)
-    say('>> Do not specify a version for a non-custom release. Given version will be ignored.') if
-      version && update_type != UPDATE_TYPES[3]
+    if version && update_type != UPDATE_TYPES[3]
+      say('>> Do not specify a version for a non-custom release. Given version will be ignored.')
+    end
 
     if !version && update_type == UPDATE_TYPES[3]
       @version = ask('>> Please enter your desired version for your custom release (X.Y.Z):')
@@ -40,7 +41,7 @@ class ReleaseProject
   def validate_project_name(project_name)
     abort('>> No project name given.') unless project_name
     unless system("#{MOVE_TO_TEMP} && hub clone #{project_name} && " \
-                  "cd #{project_name} && git checkout master && git flow init -d")
+                  "cd #{folder_name(project_name)} && git checkout master && git flow init -d")
       cleanup
       abort('>> Project not found on Github.')
     end
@@ -51,20 +52,23 @@ class ReleaseProject
 
     release_start project_name, update_type, version
 
-    say '>> Project successfully released.'
+    say ">> Project successfully released with version #{version}."
   end
 
   def release_start(project_name, update_type, version)
     abort('>> Unable to pull from Github. Cancelling release.') unless checkout? project_name
 
-    abort('>> Please bump the version in files manually. Cancelling release.') if
-      update_type != UPDATE_TYPES[3] && !version_bump?(project_name, current_version(project_name))
+    if update_type != UPDATE_TYPES[3] && !version_bump?(project_name, current_version(project_name))
+      abort('>> Please bump the version in files manually. Cancelling release.')
+    end
 
-    abort('>> Cancelling Release.') unless
-      agree(">> Are you sure you wish to deploy '#{project_name}' " \
+    unless agree(">> Are you sure you wish to deploy '#{project_name}' " \
             "as a #{update_type} release (#{current_version(project_name)} => #{version})?")
-    abort('>> Unable to finish release and push to master. Cancelling release.') unless
-      release_flow project_name, version
+      abort('>> Cancelling Release.')
+    end
+
+    return if release_flow(project_name, version)
+    abort('>> Unable to finish release and push to master. Cancelling release.')
   end
 
   def checkout?(project_name)
@@ -74,9 +78,12 @@ class ReleaseProject
   end
 
   def version_bump?(project_name, current_version)
-    return true unless
-      system("#{move_and_cd(project_name)} &&  grep -R --color --exclude-dir=.git '#{current_version}' .")
-    agree('>> Current version number found in above files! Do you wish to continue without changing it?')
+    if system("#{move_and_cd(project_name)} &&  grep -R -F --color --exclude-dir=.git '#{current_version}' .")
+      agree(">> Current version number (#{current_version}) found in above files. " \
+          ' Do you wish to continue without changing it?')
+    else
+      true
+    end
   end
 
   def release_flow(project_name, version)
@@ -107,7 +114,11 @@ class ReleaseProject
   end
 
   def move_and_cd(project_name)
-    "#{MOVE_TO_TEMP} && cd #{project_name}"
+    "#{MOVE_TO_TEMP} && cd #{folder_name(project_name)}"
+  end
+
+  def folder_name(project_name)
+    project_name.split('/').last
   end
 
   def cleanup

data/lib/renuo/cli/app/services/cloudfront_config_service.rb

@@ -1,7 +1,8 @@
 class CloudfrontConfigService
-  def initialize(bucket, bucket_alias)
+  def initialize(bucket, bucket_alias, tags = [])
     @bucket = bucket
     @bucket_alias = bucket_alias
+    @tags = tags
   end
 
   def to_s
@@ -103,6 +104,9 @@ class CloudfrontConfigService
         "WebACLId": '',
         "HttpVersion": 'http2',
         "IsIPV6Enabled": true
+      },
+      "Tags": {
+        "Items": @tags
       }
     }
   end

data/lib/renuo/cli/version.rb

@@ -1,5 +1,5 @@
 module Renuo
   module Cli
-    VERSION = '0.0.13'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/renuo-cli.gemspec

@@ -1,12 +1,12 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'renuo/cli/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'renuo-cli'
   spec.version = Renuo::Cli::VERSION
-  spec.authors = ['Lukas Elmer']
-  spec.email = ['lukas.elmer@gmail.com']
+  spec.authors = ['Renuo AG']
+  spec.email = ['info@renuo.ch']
 
   spec.summary = 'The Renuo CLI automates some commonly used workflows by providing a command line interface.'
   spec.description = 'The Renuo CLI automates some commonly used workflows by providing a command line interface.'
@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop', '0.52.1'
+  spec.add_development_dependency 'rubocop', '0.55'
   spec.add_development_dependency 'simplecov', '0.10.0' # TODO: update and fix coverage
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.1
 platform: ruby
 authors:
-- Lukas Elmer
+- Renuo AG
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '0.55'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '0.55'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +195,7 @@ dependencies:
 description: The Renuo CLI automates some commonly used workflows by providing a command
   line interface.
 email:
-- lukas.elmer@gmail.com
+- info@renuo.ch
 executables:
 - renuo
 extensions: []
@@ -216,6 +216,7 @@ files:
 - Rakefile
 - bin/check
 - bin/console
+- bin/run
 - bin/setup
 - exe/renuo
 - lib/renuo/cli.rb
@@ -258,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The Renuo CLI automates some commonly used workflows by providing a command