seiton 0.0.6 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea0570c0626f45cd54f5032682a7407e453ceb4dd58106fed42fa93486a19235
-  data.tar.gz: 788a3308edcde668f7ce959fce1e05e285c30547bfbb571d8fd245f6a360acca
+  metadata.gz: 68c2eabf63161a231cb8de12a3836e3dbc0e66e73410978fe0f08600c4f916dd
+  data.tar.gz: 38e22caf6a46b10b8e5a133015da577b7c619801a8609f7a22ba7f8cdbbd042b
 SHA512:
-  metadata.gz: 80a0343730dd939401076e414035489c8af8fb4de4473d039765b9eac00d62b76a3d07e8955ed9a524bfabacb9b87f204fa3a7e1cacb28e5a4fc8cb4fa12a020
-  data.tar.gz: 91eca85684d31116681727a197ef6617468665edd87122b5f39e4ab9fcbca81aea4ce3e3b5c7d93309327e566f461d5da708d7970bda05e03fd3b6dcf2f08b56
+  metadata.gz: b99b0b5a3abe2d580c487c854a4d773f4e4dfa0ca19e01f484d36741a9b79df626dcee82ff17b3847dbee953cc52c8f9ea90e09cf52a2f3f3750e93dd320aa3f
+  data.tar.gz: 0d156ec83984ad4e0786824beeec9d7ebd5d6e6f56ec9d638af3ee09b6400a327ee3ceba4b4d626ae701a0175efd80c3e3e44d6390617582a325576a4f6caf98

data/.circleci/config.yml

@@ -0,0 +1,33 @@
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: cimg/ruby:2.6.5
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "Gemfile.lock" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            bundle exec rake spec
+      # collect reports
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results

data/README.md

@@ -1,4 +1,4 @@
-# seiton
+# seiton [![CircleCI](https://circleci.com/gh/oreno-tools/seiton.svg?style=svg)](https://circleci.com/gh/oreno-tools/seiton)
 
 The seiton (整頓) tidies up your AWS Resources.
 
@@ -8,7 +8,6 @@ Add this line to your application's Gemfile:
 
 ```ruby
 gem 'seiton'
-gem 'rake' # require
 ```
 
 And then execute:
@@ -31,7 +30,7 @@ $ gem install seiton
 $ bundle exec seiton --help
 Commands:
   seiton ami             # Delete the EC2 AMI.
-  seiton ec2_snapshot    # Delete the EC2 Snapshot.
+  seiton ebs_snapshot    # Delete the EC2 Snapshot.
   seiton eip             # Delete the Elastic IP.
   seiton help [COMMAND]  # Describe available commands or one specific command
   seiton init            # Initialize seiton.
@@ -39,6 +38,12 @@ Commands:
   seiton rds_snapshot    # Delete the RDS Snapshot.
   seiton sqs_queue       # Delete the SQS Queue.
   seiton version         # Print the version number.
+
+Options:
+  -b, [--before-datetime=BEFORE_DATETIME]  # Specify the date and time for deletion (delete resources before the specified date and time.)
+  -i, [--ignores=one two three]            # Specify resources to be undeleted (you can specify multiple resources).
+      [--ignores-file=IGNORES_FILE]        # Specify file name for resources list to be undeleted.
+  -c, [--check], [--no-check]              # Check the resources to be deleted.
 ```
 
 ### Init

data/lib/seiton.rb

@@ -2,12 +2,12 @@ require 'seiton/cli'
 require 'seiton/client'
 require 'seiton/common'
 require 'seiton/ext'
-require 'seiton/ec2_check'
+require 'seiton/checks/ec2'
 require 'seiton/ec2'
 require 'seiton/ignores'
-require 'seiton/rds_check'
+require 'seiton/checks/rds'
 require 'seiton/rds'
-require 'seiton/sqs_check'
+require 'seiton/checks/sqs'
 require 'seiton/sqs'
 require 'seiton/version'
 

data/lib/seiton/{ec2_check.rb → checks/ec2.rb}

@@ -17,8 +17,7 @@ end
 <%- end -%>
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "ec2_instance_spec.rb", "w") do |file|
+      File.open("spec/" + "ec2_instance_spec.rb", "w") do |file|
         file.puts "require 'spec_helper'"
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end
@@ -32,8 +31,7 @@ describe ebs("<%= resource.volume_id %>") do
 end
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "ec2_volumes_spec.rb", "w") do |file|
+      File.open("spec/" + "ec2_volumes_spec.rb", "w") do |file|
         file.puts "require 'spec_helper'"
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end
@@ -56,21 +54,19 @@ end
 <%- end -%>
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "ec2_images_spec.rb", "w") do |file|
+      File.open("spec/" + "ec2_images_spec.rb", "w") do |file|
         file.puts "require 'spec_helper'"
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end
     end
 
-    def generator_ec2_snapshots_check(delete_resources)
+    def generator_ebs_snapshots_check(delete_resources)
       template = <<-'EOF'
 <% delete_resources.each do |resource| %>
 <%= resource.snapshot_id %>
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "ec2_snapshots_list.txt", "w") do |file|
+      File.open("spec/" + "ebs_snapshots_list.txt", "w") do |file|
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end
     end
@@ -92,8 +88,7 @@ end
 <%- end -%>
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "ec2_eips_spec.rb", "w") do |file|
+      File.open("spec/" + "ec2_eips_spec.rb", "w") do |file|
         file.puts "require 'spec_helper'"
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end

data/lib/seiton/{rds_check.rb → checks/rds.rb}

@@ -11,8 +11,7 @@ ignore|<%= resouce.db_cluster_snapshot_identifier %>
 <%- end -%>
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "db_snapshots_list.txt", "w") do |file|
+      File.open("spec/" + "db_snapshots_list.txt", "w") do |file|
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end
     end

data/lib/seiton/{sqs_check.rb → checks/sqs.rb}

@@ -17,8 +17,7 @@ end
 <%- end -%>
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "sqs_queue_spec.rb", "w") do |file|
+      File.open("spec/" + "sqs_queue_spec.rb", "w") do |file|
         file.puts "require 'spec_helper'"
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end

data/lib/seiton/cli.rb

@@ -10,6 +10,10 @@ require 'erb'
 module Seiton
   class CLI < Thor
     default_command :version
+    class_option :before_datetime, type: :string, aliases: '-b', desc: 'Specify the date and time for deletion (delete resources before the specified date and time.)'
+    class_option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
+    class_option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
+    class_option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
 
     desc 'version', 'Print the version number.'
     def version
@@ -23,10 +27,6 @@ module Seiton
     end
 
     desc 'ami', 'Delete the EC2 AMI.'
-    option :before_datetime, type: :string, aliases: '-b', desc: 'Specify the date and time for deletion (delete resources before the specified date and time.)'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
     def ami
       unless options[:before_datetime] then
         puts '--before-datetime must be specified. (--before-datetime=YYYY/MM/DD)'
@@ -38,12 +38,8 @@ module Seiton
       seiton.ec2_image(options[:check], options[:before_datetime], ignores)
     end
 
-    desc 'ec2_snapshot', 'Delete the EC2 Snapshot.'
-    option :before_datetime, type: :string, aliases: '-b', desc: 'Specify the date and time for deletion (delete resources before the specified date and time.)'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
-    def ec2_snapshot
+    desc 'ebs_snapshot', 'Delete the EC2 Snapshot.'
+    def ebs_snapshot
       unless options[:before_datetime] then
         puts '--before-datetime must be specified. (--before-datetime=YYYY/MM/DD)'
         exit 1
@@ -51,15 +47,11 @@ module Seiton
 
       ignores = Seiton::Ignores.new(options[:ignores_file], options[:ignores]).generate
       seiton = Seiton::Ec2.new
-      seiton.ec2_snapshots(options[:check],
+      seiton.ebs_snapshots(options[:check],
                            options[:before_datetime], ignores)
     end
 
     desc 'instance', 'Delete the EC2 Instance.'
-    option :before_datetime, type: :string, aliases: '-b', desc: 'Specify the date and time for deletion (delete resources before the specified date and time.)'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
     def instance
       unless options[:before_datetime] then
         puts '--before-datetime must be specified. (--before-datetime=YYYY/MM/DD)'
@@ -72,10 +64,6 @@ module Seiton
     end
 
     desc 'rds_snapshot', 'Delete the RDS Snapshot.'
-    option :before_datetime, type: :string, aliases: '-b', desc: 'Specify the date and time for deletion (delete resources before the specified date and time.)'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
     def rds_snapshot
       unless options[:before_datetime] then
         puts '--before-datetime must be specified. (--before-datetime=YYYY/MM/DD)'
@@ -88,9 +76,6 @@ module Seiton
     end
 
     desc 'eip', 'Delete the Elastic IP.'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
     def eip
       ignores = Seiton::Ignores.new(options[:ignores_file], options[:ignores]).generate
       seiton = Seiton::Ec2.new
@@ -98,9 +83,6 @@ module Seiton
     end
 
     desc 'sqs_queue', 'Delete the SQS Queue.'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
     def sqs_queue
       ignores = Seiton::Ignores.new(options[:ignores_file], options[:ignores]).generate
       seiton = Seiton::Sqs.new

data/lib/seiton/common.rb

@@ -38,25 +38,5 @@ module Seiton
       end
       volume_ids
     end
-
-    def ignores(ignores_file, ignore_list)
-      ignores = nil
-      begin
-        File.open(ignores_file) do |file|
-          file.read.split("\n").each do |ignore|
-            ignores << ignore
-          end
-        end
-      rescue SystemCallError => e
-        puts e.message
-        exit 1
-      rescue IOError => e
-        puts e.message
-        exit 1
-      end unless ignore_file.nil?
-      ignores.concat(ignore_list) unless ignore_list.nil?
-
-      ignores
-    end
   end
 end

data/lib/seiton/ec2.rb

@@ -156,10 +156,10 @@ module Seiton
         exit 0
       end
 
-      ec2_snapshot(delete_image_ids)
+      ebs_snapshot(delete_image_ids)
     end
 
-    def ec2_snapshots(check = false, dt, ignores)
+    def ebs_snapshots(check = false, dt, ignores)
       if check
         log.info('List up the resources to be removed.')
       else
@@ -202,7 +202,7 @@ module Seiton
       end
 
       puts display_snapshot_resources(delete_snapshots)
-      generator_ec2_snapshots_check(delete_snapshots)
+      generator_ebs_snapshots_check(delete_snapshots)
       exit 0 if check
 
       delete_snapshot_ids = []
@@ -219,10 +219,10 @@ module Seiton
         exit 0
       end
 
-      ec2_snapshot(delete_image_ids)
+      ebs_snapshot(delete_image_ids)
     end
 
-    def ec2_snapshot(delete_image_ids)
+    def ebs_snapshot(delete_image_ids)
       log.info('Start EC2 Snapshot deleting.')
       res = ec2_client.describe_snapshots(owner_ids: [iam_user.arn.split(':')[4]])
       delete_snapshots = []
@@ -238,7 +238,7 @@ module Seiton
       end
 
       puts display_snapshot_resources(delete_snapshots)
-      generator_ec2_snapshots_check(delete_snapshots)
+      generator_ebs_snapshots_check(delete_snapshots)
 
       if process_ok?
         begin

data/lib/seiton/ignores.rb

@@ -6,7 +6,7 @@ module Seiton
     end
 
     def generate
-      ignores = nil
+      ignores = []
       begin
         File.open(@file) do |file|
           file.read.split("\n").each do |ignore|

data/lib/seiton/init.rb

@@ -7,14 +7,14 @@ module Seiton
     end
 
     def self.create_directory
-      puts 'Create check directory...'
-      FileUtils.mkdir_p('check') unless FileTest.exist?('check')
+      puts 'Create spec directory...'
+      FileUtils.mkdir_p('spec') unless FileTest.exist?('spec')
       spec_helper = <<~SPEC_HELPER
 require 'awspec'
 Awsecrets.load(secrets_path: File.expand_path('./secrets.yml', File.dirname(__FILE__)))
       SPEC_HELPER
 
-      File.open('check/spec_helper.rb', 'w') do |f| 
+      File.open('spec/spec_helper.rb', 'w') do |f|
         f.puts(spec_helper)
       end
     end
@@ -30,7 +30,7 @@ require 'logger'
 namespace :check do
   targets1 = []
   targets2 = []
-  Dir.glob(['./spec/*', './check/*']).each do |file|
+  Dir.glob(['./spec/*']).each do |file|
     target = File.basename(file)
     if target.include?('_spec.rb') then
       targets1 << File.basename(target, '_spec.rb')
@@ -44,7 +44,7 @@ namespace :check do
 
     RSpec::Core::RakeTask.new(target.to_sym) do |t|
       # t.rspec_opts = ["--format documentation", "--format html", "--out ./result_html/\#{target}_result.html"]
-      t.rspec_opts = ["--format documentation", "--format html", "--out ./result_html/\#{target}_result.html"]
+      t.rspec_opts = ["--format documentation"]
       t.pattern = "spec/\#{target}_spec.rb"
       t.verbose = true
     end if target != 'ec2_snapshot'
@@ -55,7 +55,7 @@ namespace :check do
     task target.to_sym do
       log.info('Check that ' + target + ' has been deleted.')
       resouces = []
-      File.open('./check/' + target + '_list.txt', "r") do |f|
+      File.open('./spec/' + target + '_list.txt', "r") do |f|
         f.each_line do |line|
           resouces << line.chomp
         end

data/lib/seiton/version.rb

@@ -1,3 +1,3 @@
 module Seiton
-  VERSION = "0.0.6"
+  VERSION = "0.1.1"
 end

data/seiton.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.1.4"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_dependency "rake"
   spec.add_dependency 'thor'
   spec.add_dependency 'aws-sdk'
   spec.add_dependency 'terminal-table'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: seiton
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.1
 platform: ruby
 authors:
 - inokappa
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - Gemfile
 - README.md
@@ -124,18 +125,18 @@ files:
 - bin/setup
 - exe/seiton
 - lib/seiton.rb
+- lib/seiton/checks/ec2.rb
+- lib/seiton/checks/rds.rb
+- lib/seiton/checks/sqs.rb
 - lib/seiton/cli.rb
 - lib/seiton/client.rb
 - lib/seiton/common.rb
 - lib/seiton/ec2.rb
-- lib/seiton/ec2_check.rb
 - lib/seiton/ext.rb
 - lib/seiton/ignores.rb
 - lib/seiton/init.rb
 - lib/seiton/rds.rb
-- lib/seiton/rds_check.rb
 - lib/seiton/sqs.rb
-- lib/seiton/sqs_check.rb
 - lib/seiton/version.rb
 - seiton.gemspec
 homepage: https://github.com/oreno-tools/seiton