slnky 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e747630542d981d1f4ab34882597fc75b001b4e4
-  data.tar.gz: c0cf47bda3335ff7f14ce4e40c36f208bd0e20fc
+  metadata.gz: 80d5dc68a166001641591a4ef021f391dd70f94f
+  data.tar.gz: 94b1e65b7268f55da42fc1c7b807d1f64192a8d3
 SHA512:
-  metadata.gz: 7f7de1bc212ad6defd0621727b40902247aeef3027a92ec5f8598efddda93c3ee83e5f5b2e105722d271dcf32db16262bb404a62ac47e04fca7b5e4b32a82e57
-  data.tar.gz: 28a571ede88ffe0c67e713f8124b816f3955a261c8861bc1a988ed0332150a6102e89d0e930dd44aa8fc17dc57897bb69d78d26f288f2d03a9ea19f2e9cc9700
+  metadata.gz: 0870455ed3aa7cebc2ef3da4e29a8685e3e1d199e6c85cc151484f48e7924fafe81ad2e87f30435563c3d7a78f4ad7d30d0bea74d50c4817d8641311a0f220ea
+  data.tar.gz: 416f5224034de7e6b4138f5733180833261e841d8680e44b66ee1b5c25620fc57f675fbdbe9d8d0c85df3d47b5301afff46df14e5383b8c149b3847d4304ac1e

data/bin/slnky

@@ -4,4 +4,4 @@ require 'rubygems'
 require 'bundler/setup'
 require 'slnky/cli'
 
-Slnky::CLI::Main.start(ARGV)
+Slnky::CLI::Main.run

data/lib/slnky/cli/generate.rb

@@ -1,17 +1,21 @@
 module Slnky
   module CLI
-    class Generate < Thor
-      desc 'service NAME [DIR]', 'generate a service named NAME'
-      def service(name, dir=nil)
-        generator = Slnky::Generator::Service.new(name, dir)
-        generator.generate
+    class Generate < Base
+      subcommand 'service', 'generate a service named NAME' do
+        parameter 'NAME', 'the name of the service'
+        def execute
+          generator = Slnky::Generator::Service.new(name, dir)
+          generator.generate
+        end
       end
 
-      desc 'command NAME [DIR]', 'generate a service named NAME'
-      def command(name, dir=nil)
-        raise Thor::Error, "not implemented"
-        # Slnky::Generator::Command.new(name, dir).generate
+      subcommand 'command', 'generate a command named NAME' do
+        parameter 'NAME', 'the name of the command'
+        def execute
+          raise 'not implemented'
+        end
       end
     end
   end
 end
+Slnky::CLI::Main.subcommand 'generate', 'generate from templates', Slnky::CLI::Generate

data/lib/slnky/cli/notify.rb

@@ -0,0 +1,41 @@
+module Slnky
+  module CLI
+    class Notify < Base
+      # option %w{-s --server}, '[SERVER]', 'set server url', environment_variable: 'SLNKY_SERVER'
+      option %w{-f --file}, '[FILE]', 'load attributes from yaml file' do |f|
+        unless File.exist?(f)
+          puts "ERROR: file #{f} does not exist"
+          exit(1)
+        end
+        f
+      end
+      parameter 'NAME', 'the name of the event to send'
+      parameter '[ATTRIBUTES] ...', 'key=value pairs to add to the event, merged with optional file', attribute_name: :kvs
+
+      def execute
+        attributes = {}
+        if file
+          begin
+            yaml = YAML.load_file(file)
+            attributes.merge!(yaml)
+          rescue => e
+            puts "ERROR: reading file #{file}"
+            exit(1)
+          end
+        end
+        kvs.each do |kv|
+          (k, v) = kv.split('=')
+          attributes[k] = v
+        end
+        msg = Slnky::Message.new({name: name, attributes: attributes})
+        cfg = Slnky.config
+        srv = server || cfg['slnky']['url']
+
+        puts 'sending message:'
+        puts JSON.pretty_generate(msg.to_h)
+        Slnky.notify(msg)
+      end
+    end
+  end
+end
+Slnky::CLI::Main.subcommand 'notify', 'send notification to the slnky server', Slnky::CLI::Notify

data/lib/slnky/cli.rb

@@ -1,37 +1,45 @@
 require 'slnky'
 require 'yaml'
-require 'thor'
+require 'clamp'
 require 'active_support/all'
 
-path = File.expand_path("../cli", __FILE__)
-Dir["#{path}/**/*.rb"].each do |file|
-  require file
-end
-
 module Slnky
   module CLI
-    class Main < Thor
-      map %w[--version -v] => :__print_version
-
-      desc "--version, -v", "print the version"
-      def __print_version
+    class Base < Clamp::Command
+      option %w{-v --version}, :flag, 'print version' do |v|
         puts "Slnky version: #{Slnky::VERSION}"
+        exit(0)
       end
 
-      desc 'init', 'initialize configuration directory'
-      def init
-        dir = "#{ENV['HOME']}/.slnky"
-        FileUtils.mkdir_p(dir)
-        defaults = {
-            slnky: {
-                url: 'http://localhost:3000'
-            }
-        }.deep_stringify_keys
-        File.open("#{dir}/config.yaml", "w+") {|f| f.write(defaults.to_yaml)}
+      option %w{-c --config}, '[CONFIG]', 'set config directory location', default: '~/.slnky', environment_variable: 'SLNKY_CONFIG' do |c|
+        p = File.expand_path("#{c}/config.yaml")
+        Slnky.load_config(p)
+        c
       end
 
-      desc 'generate', 'generate slnky objects from templates'
-      subcommand 'generate', Slnky::CLI::Generate
+      option %w{-s --server}, '[SERVER]', 'set server url', environment_variable: 'SLNKY_SERVER'
+    end
+
+    class Main < Base
+      subcommand 'init', 'initialize the configuration directory' do
+        parameter '[SERVER]', 'the server to point to', default: 'http://localhost:3000'
+
+        def execute
+          dir = "#{ENV['HOME']}/.slnky"
+          FileUtils.mkdir_p(dir)
+          defaults = {
+              slnky: {
+                  url: server
+              }
+          }.deep_stringify_keys
+          File.open("#{dir}/config.yaml", "w+") { |f| f.write(defaults.to_yaml) }
+        end
+      end
     end
   end
 end
+
+path = File.expand_path("../cli", __FILE__)
+Dir["#{path}/**/*.rb"].each do |file|
+  require file
+end

data/lib/slnky/data.rb

@@ -0,0 +1,16 @@
+require 'json'
+require 'slnky/ext/deep_struct'
+
+module Slnky
+  class Data < DeepStruct
+    class << self
+      def parse(str)
+        new(JSON.parse(str))
+      end
+    end
+
+    def to_s
+      to_h.to_json
+    end
+  end
+end

data/lib/slnky/message.rb

@@ -2,15 +2,7 @@ require 'json'
 require 'slnky/ext/deep_struct'
 
 module Slnky
-  class Message < DeepStruct
-    class << self
-      def parse(str)
-        new(JSON.parse(str))
-      end
-    end
+  class Message < Data
 
-    def to_s
-      to_h.to_json
-    end
   end
 end

data/lib/slnky/version.rb

@@ -1,3 +1,3 @@
 module Slnky
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/lib/slnky.rb

@@ -1,10 +1,31 @@
 require 'slnky/version'
+require 'slnky/data'
 require 'slnky/message'
 require 'slnky/service'
 require 'slnky/generator'
 
+require 'rest_client'
+
 module Slnky
-  def version
-    Slnky::VERSION
+  class << self
+    def version
+      Slnky::VERSION
+    end
+
+    def config
+      load_config unless @config
+      @config
+    end
+
+    def load_config(file='~/.slnky/config.yaml')
+      path = File.expand_path(file)
+      @config = Slnky::Data.new(YAML.load_file(path))
+    end
+
+    def notify(msg, server=nil)
+      server ||= config.slnky.url
+      params = {name: msg.name, event: msg.to_h}
+      RestClient.post "#{server}/hooks/notify", params.to_json, content_type: :json, accept: :json
+    end
   end
 end

data/slnky.gemspec

@@ -33,8 +33,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'dotenv', '~> 2.1.0'
   spec.add_dependency 'amqp', '~> 1.5.1'
-  spec.add_dependency 'thor', '~> 0.19.1'
+  spec.add_dependency 'clamp', '~> 1.0.0'
   spec.add_dependency 'activesupport', '~> 4.2.5.1'
   spec.add_dependency 'tilt', '~> 2.0.2'
   spec.add_dependency 'eventmachine', '~> 1.0.9.1'
+  spec.add_dependency 'rest-client', '~> 1.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slnky
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.9.1
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 description: core slnky lib and command line
 email:
 - me@shawncatz.com
@@ -160,6 +174,8 @@ files:
 - lib/slnky.rb
 - lib/slnky/cli.rb
 - lib/slnky/cli/generate.rb
+- lib/slnky/cli/notify.rb
+- lib/slnky/data.rb
 - lib/slnky/ext/deep_struct.rb
 - lib/slnky/generator.rb
 - lib/slnky/generator/command.rb
@@ -212,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: core slnky lib and command line