barruun 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64f304a776a79c69b23f954502e22e6b0ec84808dcf5bb8448fd3574fde4d692
-  data.tar.gz: 0eeabbcb7f812219d92f6b0105a50c2189eaafbb1e9e1494104a6b86f49414c5
+  metadata.gz: 9decd7dacebba1fb4656151f53f93ffb9eb40e50d11cf2857d94f8c39a91dcb3
+  data.tar.gz: 288089cad737ee2aeab66e9ca916b0b06d8cc2418da2b9fe2a0560016b2a7be2
 SHA512:
-  metadata.gz: 6241c035c3b74444334fd115d5b8376749a5cb338ec7d639103778045ead094e906a552c56fc8f97a422631c94e7d36293b36e97d23f8462d504a45c2f76b561
-  data.tar.gz: 0e2b71e50c8e641cc88501c2fb25ed9b660f81a0cead88e6e708dfcd9252a4312c1180fadbbe4c8bbfa7e0c1cddf59499e1dd61ff5003666876a05d8ada27d97
+  metadata.gz: 80b36585f4e4b397208992ea82ed2ab90ed98147b5a37535f419ddb5b24f06ce619be1533dfae3fffa0fe9da0f76986eca1a6769d3ca0a76dac33374bc75da41
+  data.tar.gz: e7b8efa49ae874feb0f6e72f3fbc45dff60923209a072a60dc74724972b65ec79d42e6c1f2bd1a4ade594b2651fa89e2e1185d631a0143e19d799c10f0c590d6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    barruun (0.1.1)
+    barruun (0.1.5)
       active_hash
       thor (~> 1.1)
 

data/README.md

@@ -37,9 +37,11 @@ Commands:
 
 #### Sink
 
+Please set project id to `PROJECT_ID`.
+
 ```yaml
 name: foobar
-destination: bigquery.googleapis.com/projects/#{project_id}/datasets/test
+destination: bigquery.googleapis.com/projects/:PROJECT_ID/datasets/test
 log-filter: 'jsonPayload."event-data":*'
 ```
 

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
@@ -12,7 +18,7 @@ module Barruun
         end
 
         def destination
-          @hash["destination"].gsub("\#\{project_id\}", @project_id)
+          @hash["destination"].gsub(":PROJECT_ID", @project_id)
         end
 
         def options

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.1"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barruun
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - cc-kawakami
@@ -60,11 +60,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: []

data/lib/barruun/logging/sink.rb

@@ -1,15 +0,0 @@
-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 "yaml"
-require_relative "./bucket/config"
-
-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,21 +0,0 @@
-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