barruun 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b40d405d04ce967216dc4c25caa14508492e6ba01186498b0aa936402f500462
-  data.tar.gz: 83f9e2dd29e7978ca8e1c70517ccb8e51e2088a456b3caa0659fba1d7180061e
+  metadata.gz: 687ee635c9dd48bbdef5a5aa4d9e41e6b7d527c93da7f67a197c5a41f2458384
+  data.tar.gz: '068eb03f2e78b5ee3df8ad20ee3eae5e69af6f84af0fc70b9c5494e738bf5af9'
 SHA512:
-  metadata.gz: 25daa66e59e6952a409dd201854505366ea626d44d2c924213888f6464f368becf936c3fa616ca8d236960f8d321fe35d57ff44affbce74217bbb092c95fd591
-  data.tar.gz: ec560ce503e8b6fcabb55dfd16672c508e28b38deb6ed75c729c73c6174f4c44fed8ac93f2fcef0e2438669de7fb9c0d7b2856bdd0df0a3e44594a04a69bfc67
+  metadata.gz: a7722426c4de439a7159db04d4f30fd2035c521455e2c3b210c1ae75cddaff59c2bf21be687db230141d325e27049523eecc12cd71c205c4411e61033913399c
+  data.tar.gz: 50cdc30a34cfe43d59b9d0c38141c4d0dfd15b90e9caacfa092bbd20932b5e806528c606f622c485594bbaf84425f5a1a8ba80434b61e673a0e7ada95ba97cd7

data/Gemfile.lock

@@ -1,25 +1,13 @@
 PATH
   remote: .
   specs:
-    barruun (0.1.2)
-      active_hash
+    barruun (0.1.6)
       thor (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    active_hash (3.1.0)
-      activesupport (>= 5.0.0)
-    activesupport (7.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    concurrent-ruby (1.1.9)
     diff-lcs (1.5.0)
-    i18n (1.8.11)
-      concurrent-ruby (~> 1.0)
-    minitest (5.15.0)
     power_assert (1.1.7)
     rake (13.0.6)
     rspec (3.10.0)
@@ -39,8 +27,6 @@ GEM
       rspec (>= 2.14)
     rspec-support (3.10.3)
     thor (1.2.1)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
     webrick (1.7.0)
     yard (0.9.27)
       webrick (~> 1.7.0)

data/README.md

@@ -62,6 +62,21 @@ bucket-level: 'on'
 location: us-central1
 ```
 
+### BigQuery
+
+```
+Commands:
+  barruun bigquery dataset [FILEPATH]  # Create dataset
+  barruun bigquery help [COMMAND]      # Describe subcommands or one specific subcommand
+```
+
+#### Dataset
+
+```yaml
+name: foobar
+location: asia-northeast1
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/barruun.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 "
   spec.description = "Barruun is a simple tool for Infrastructure as Code of Google Cloud Platform using `gcloud` command.
 "
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   spec.metadata["source_code_uri"] = "https://github.com/colorfulcompany/barruun"
 
@@ -26,5 +26,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor", "~> 1.1"
-  spec.add_runtime_dependency "active_hash"
 end

data/lib/barruun/cli.rb

@@ -2,16 +2,23 @@ require "thor"
 
 module Barruun
   class StorageCommand < Thor
-    desc "bucket [FILEPATH]", "Create or update bucket"
+    desc "bucket [FILEPATH]", "Create bucket"
     def bucket(file_path)
-      Barruun::Storage::Bucket.new(file_path).call
+      Barruun::Managers::Storage::Bucket.new(file_path).call
     end
   end
 
   class LoggingCommand < Thor
-    desc "sink [FILEPATH]", "Create or update sink"
+    desc "sink [FILEPATH]", "Create sink"
     def sink(file_path)
-      Barruun::Logging::Sink.new(file_path).call
+      Barruun::Managers::Logging::Sink.new(file_path).call
+    end
+  end
+  
+  class BigqueryCommand < Thor
+    desc "dataset [FILEPATH]", "Create dataset"
+    def sink(file_path)
+      Barruun::Managers::Bigquery::Dataset.new(file_path).call
     end
   end
 
@@ -22,5 +29,6 @@ module Barruun
 
     register(StorageCommand, 'storage', 'storage <command>', 'Manage Cloud Storage')
     register(LoggingCommand, 'logging', 'logging <command>', 'Manage Cloud Logging')
+    register(BigqueryCommand, 'bigquery', 'bigquery <command>', 'Manage BigQuery')
   end
 end

data/lib/barruun/configurations/bigquery/dataset.rb

@@ -0,0 +1,19 @@
+module Barruun
+  module Configurations
+    module Bigquery
+      class Dataset
+        def initialize(hash)
+          @hash = hash
+        end
+
+        def name
+          @hash["name"]
+        end
+  
+        def options
+          @hash.reject { |k| ["name"].include?(k) }
+        end
+      end
+    end
+  end
+end

data/lib/barruun/{logging/sink/config.rb → configurations/logging/sink.rb}

@@ -1,10 +1,16 @@
 module Barruun
-  module Logging
-    class Sink
-      class Config
+  module Configurations
+    module Logging
+      class Sink
+        class ProjectIDNotProvidedError < RuntimeError; end
+
         def initialize(hash, project_id = ENV["PROJECT_ID"])
           @hash = hash
           @project_id = project_id
+
+          if @project_id.nil?
+            raise ProjectIDNotProvidedError, "Project ID not provided"
+          end
         end
 
         def name

data/lib/barruun/{storage/bucket/config.rb → configurations/storage/bucket.rb}

@@ -1,7 +1,7 @@
 module Barruun
-  module Storage
-    class Bucket
-      class Config
+  module Configurations
+    module Storage
+      class Bucket
         def initialize(hash)
           @hash = hash
         end

data/lib/barruun/managers/bigquery/dataset.rb

@@ -0,0 +1,20 @@
+require_relative "../../configurations/bigquery/dataset"
+require_relative "../utils"
+
+module Barruun
+  module Managers
+    module Bigquery
+      class Dataset
+        include Barruun::Managers::Utils
+
+        def create
+          `bq #{location_string} mk --dataset #{options_string(@config.options)} #{@config.name}`
+        end
+
+        def exist?
+          `bq ls`.include?(@config.name)
+        end
+      end
+    end
+  end
+end

data/lib/barruun/managers/logging/sink.rb

@@ -0,0 +1,20 @@
+require_relative "../../configurations/logging/sink"
+require_relative "../utils"
+
+module Barruun
+  module Managers
+    module Logging
+      class Sink
+        include Barruun::Managers::Utils
+
+        def create
+          `gcloud logging sinks create #{@config.name} #{@config.destination} #{options_string(@config.options)}`
+        end
+
+        def exist?
+          `gcloud logging sinks list --filter='name: #{@config.name}'`.include?(@config.name)
+        end
+      end
+    end
+  end
+end

data/lib/barruun/managers/storage/bucket.rb

@@ -0,0 +1,20 @@
+require_relative "../../configurations/storage/bucket"
+require_relative "../utils"
+
+module Barruun
+  module Managers
+    module Storage
+      class Bucket
+        include Barruun::Managers::Utils
+
+        def create
+          `gcloud alpha storage buckets create #{options_string(@config.options)} #{@config.name}`
+        end
+
+        def exist?
+          `gcloud alpha storage buckets list --filter='name: #{@config.name}'`.include?(@config.name)
+        end
+      end
+    end
+  end
+end

data/lib/barruun/managers/utils.rb

@@ -0,0 +1,32 @@
+require "yaml"
+
+module Barruun
+  module Managers
+    module Utils
+      def self.included(obj)
+        obj.const_set('ConfigFileLoadError', Class.new(RuntimeError))
+      end
+
+      def initialize(file_path, config_klass = Object.const_get("#{self.class.name.gsub("Managers", "Configurations")}"))
+        @file_path = file_path
+        if !File.exists?(@file_path)
+          raise self.class::ConfigFileLoadError, "Error loading config file: #{file_path}"
+        end
+        @config = config_klass.new(YAML.load_file(file_path))
+      end
+
+      def call
+        if exist?
+          puts "#{self.class.name} #{@config.name} already exists. Nothing to do."
+        else
+          puts "#{self.class.name} #{@config.name} not found."
+          create
+        end
+      end
+
+      def options_string(options)
+        options.map { |k, v| "--#{k}=#{v}" }.compact.join(" ")
+      end
+    end
+  end
+end

data/lib/barruun/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Barruun
-  VERSION = "0.1.2"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barruun
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - cc-kawakami
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: active_hash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 'Barruun is a simple tool for Infrastructure as Code of Google Cloud
   Platform using `gcloud` command.
 
@@ -60,11 +46,13 @@ files:
 - exe/barruun
 - lib/barruun.rb
 - lib/barruun/cli.rb
-- lib/barruun/logging/sink.rb
-- lib/barruun/logging/sink/config.rb
-- lib/barruun/storage/bucket.rb
-- lib/barruun/storage/bucket/config.rb
-- lib/barruun/utils.rb
+- lib/barruun/configurations/bigquery/dataset.rb
+- lib/barruun/configurations/logging/sink.rb
+- lib/barruun/configurations/storage/bucket.rb
+- lib/barruun/managers/bigquery/dataset.rb
+- lib/barruun/managers/logging/sink.rb
+- lib/barruun/managers/storage/bucket.rb
+- lib/barruun/managers/utils.rb
 - lib/barruun/version.rb
 homepage: 
 licenses: []
@@ -78,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/barruun/logging/sink.rb

@@ -1,18 +0,0 @@
-require_relative "./sink/config"
-require_relative "../utils"
-
-module Barruun
-  module Logging
-    class Sink
-      include Barruun::Utils
-
-      def create
-        `gcloud logging sinks create #{@config.name} #{@config.destination} #{options_string}`
-      end
-
-      def exist?
-        `gcloud logging sinks list --filter='name: #{@config.name}'`.include?(@config.name)
-      end
-    end
-  end
-end

data/lib/barruun/storage/bucket.rb

@@ -1,18 +0,0 @@
-require_relative "./bucket/config"
-require_relative "../utils"
-
-module Barruun
-  module Storage
-    class Bucket
-      include Barruun::Utils
-
-      def create
-        system("gcloud alpha storage buckets create #{options_string} #{@config.name}")
-      end
-
-      def exist?
-        `gcloud alpha storage buckets list --filter='name: #{@config.name}'`.include?(@config.name)
-      end
-    end
-  end
-end

data/lib/barruun/utils.rb

@@ -1,23 +0,0 @@
-require "yaml"
-
-module Barruun
-  module Utils
-    def initialize(file_path, config_klass = self.class::Config)
-      @file_path = file_path
-      @config = config_klass.new(YAML.load_file(file_path))
-    end
-
-    def call
-      if exist?
-        puts "#{self.class.name} #{@config.name} already exists. Nothing to do."
-      else
-        puts "#{self.class.name} #{@config.name} not found."
-        create
-      end
-    end
-
-    def options_string
-      @config.options.map { |k, v| "--#{k}=#{v}" }.compact.join(" ")
-    end
-  end
-end