evostream-event 1.0.0.pre.65 → 1.0.0.pre.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53872935638141a25ff53658fab7e36c55ce7b09
-  data.tar.gz: 181e0a17fb95652167cd7c4300163b807ffbc045
+  metadata.gz: 60e46c9ea0c67c3da0450eb970aa741c7d558f9f
+  data.tar.gz: 8f424511782e8ac44863578ad8c4bf83e9e8d298
 SHA512:
-  metadata.gz: f0ebb8baa0572b75f1e0f72bdb9c293f01023e259a1fb9ddfea9f5aff348c134079ba9d47891b0b17e9faaef394ac26b8cfa2745950f827bf49e9c53080ef745
-  data.tar.gz: 5228b5e83a3f222ebde719ee709d0668da3939ba0b11a36c54d0f27c13b5be6a585c25bd5385a1794395103a8bb7fa0ab4d03a7fb60c67ec2789a08e896ad5a9
+  metadata.gz: b9f4afe200f71ebf54ec5c2b3e28977ffdc99172cb2ada20d986262c23888e3ff1c2e8f3761cb196028b3e77ba0b5af41b2ac402fefd73881b6e978aa5e102c6
+  data.tar.gz: dea577d1d11357b5b83207f63aef17e836a506378d3a10d198c009df56b152dafb9b465c835ca1c66de85cafaf2ea6b3b891ef917cb526a12d6dd0481ca5b1e9

data/lib/evostream/cli/option/argument.rb

@@ -38,3 +38,4 @@ require 'option/host'
 require 'option/port'
 require 'option/search'
 require 'option/config'
+require 'option/version'

data/lib/evostream/cli/option/config.rb

@@ -12,8 +12,10 @@ module Evostream
         private
 
         def action
-          file = File.join(parameter('--config'))
-          CLI::Config.instance.load_custom_file(file)
+          path = parameter('--config')
+          CLI::Config.instance.load_custom_file(File.join(path))
+        rescue
+          raise CodeError::Syntax::OptionInvalid
         end
       end
     end

data/lib/evostream/cli/option/help

@@ -20,3 +20,5 @@ Options :
 
   --config          Use customize file configuration
                     default : ~/.evostream-configuration.yml
+
+  -v, --version     Display version to Ruby and gem Evostream::Event

data/lib/evostream/cli/option/host.rb

@@ -12,7 +12,10 @@ module Evostream
         private
 
         def action
-          CLI::Config.instance.change_host(parameter('--server'))
+          param = parameter('--server')
+          CLI::Config.instance.change_host(param)
+        rescue
+          raise CodeError::Syntax::OptionInvalid
         end
       end
     end

data/lib/evostream/cli/option/port.rb

@@ -12,7 +12,10 @@ module Evostream
         private
 
         def action
-          CLI::Config.instance.change_host(parameter('--port'))
+          param = parameter('--port')
+          CLI::Config.instance.change_host(param)
+        rescue
+          raise CodeError::Syntax::OptionInvalid
         end
       end
     end

data/lib/evostream/cli/option/version.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Evostream
+  module CLI
+    module Argument
+      # Argument for display version
+      class Version < Arg
+        include Singleton
+
+        KEY = ['-v', '--version'].freeze
+
+        private
+
+        def action
+          txt = <<~INFO
+            ##################################
+            # Ruby -- #{RUBY_VERSION}
+            # Evostream::Event -- #{Evostream::VERSION}
+            ##################################
+          INFO
+          $stdout.puts txt
+          super
+        end
+      end
+    end
+  end
+end

data/lib/evostream/cli/runner.rb

@@ -27,13 +27,6 @@ module Evostream
     attr_reader :options
 
     def initialize
-      txt = <<~INFO
-        ##################################
-        # Start Evostream CLI \t\t #
-        # Version #{Evostream::VERSION} \t\t #
-        ##################################
-      INFO
-      $stdout.puts txt.red
       CLI::Config.instance
       @options = CLI::Options.new
     end
@@ -123,7 +116,11 @@ module Evostream
     end
 
     def two_last_arg(args)
-      [args.first, args.last]
+      if CLI::Argument::Search.instance.search.nil?
+        [args.first, args.last]
+      else
+        [args.last, args.last]
+      end
     end
   end
 end

data/lib/evostream/cli/search.rb

@@ -6,11 +6,9 @@ module Evostream
   module CLI
     # Search data in evostream result
     class Search
-      def initialize(yaml_search)
+      def initialize
         @response = nil
-        YAML.load(yaml_search).each do |key, value|
-          @search = [key.to_sym, value]
-        end
+        @search = CLI::Argument::Search.instance.search.split(': ')
       end
 
       def search_node(result)

data/spec/cli/argument/command_spec.rb

@@ -4,13 +4,22 @@ require 'spec_helper'
 
 describe Evostream::CLI::Argument::Command do
   let(:runner) { Evostream::Runner.new }
+  let(:out) { /Commands :\n^  - .*/ }
+  let(:code) { 0 }
 
-  it do
-    ARGV << '-c'
-    expect(runner.run).to eql(0)
+  context 'when short argument' do
+    before { ARGV.push('-c') }
+    after { ARGV.pop }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
   end
 
-  it do
-    expect { runner.run }.to output(/.*Commands :.*/).to_stdout
+  context 'when long argument' do
+    before { ARGV.push('--commands') }
+    after { ARGV.pop }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
   end
 end

data/spec/cli/argument/config_spec.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Evostream::CLI::Argument::Config do
+  before { ARGV.push('--config') }
+  after { ARGV.pop }
+
+  let(:runner) { Evostream::Runner.new }
+
+  context 'when argument with file dont exit' do
+    let(:out) { /No command executed !! No command precise\./ }
+    let(:code) { 100 }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
+  end
+
+  context 'when argument with exit file', broken: true do
+    before { ARGV.push('.travis/evostream-configuration.yml') }
+    after { ARGV.pop }
+
+    let(:out) { /Connection to Evostream REFUSED !!/ }
+    let(:code) { 201 }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
+  end
+end

data/spec/cli/argument/help_spec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Evostream::CLI::Argument::Help do
+  let(:runner) { Evostream::Runner.new }
+  let(:out) do
+    file = File.join(__dir__, '..', '..', '..', 'lib', 'evostream', 'cli', 'option', 'help')
+    File.read(file)
+  end
+  let(:code) { 0 }
+
+  context 'when short argument' do
+    before { ARGV.push('-h') }
+    after { ARGV.pop }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
+  end
+
+  context 'when long argument' do
+    before { ARGV.push('-h') }
+    after { ARGV.pop }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
+  end
+end

data/spec/cli/argument/host_spec.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Evostream::CLI::Argument::Host, type: :cli do
+  before { ARGV.push('--server') }
+  after { ARGV.pop }
+
+  let(:runner) { Evostream::Runner.new }
+
+  context 'when argument with host dont given' do
+    let(:out) { /Command is invalid !!/ }
+    let(:code) { 101 }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
+  end
+
+  context 'when argument with host given', broken: true do
+    before { ARGV.push('127.0.0.1') }
+    after { ARGV.pop }
+
+    let(:out) { /Connection to Evostream REFUSED !!/ }
+    let(:code) { 201 }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
+  end
+end

data/spec/cli/argument/port_spec.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Evostream::CLI::Argument::Port, type: :cli do
+  before { ARGV.push('--port') }
+  after { ARGV.pop }
+
+  let(:runner) { Evostream::Runner.new }
+
+  context 'when argument with port dont given' do
+    let(:out) { /Command is invalid !!/ }
+    let(:code) { 101 }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
+  end
+
+  context 'when argumentw with port given', broken: true do
+    before { ARGV.push(5489) }
+    after { ARGV.pop }
+
+    let(:out) { /No command executed !! No command precise\./ }
+    let(:code) { 100 }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
+  end
+end

data/spec/cli/argument/search_spec.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Evostream::CLI::Argument::Search, broken: true do
+  let(:runner) { Evostream::Runner.new }
+
+  context 'when short argument' do
+    before { ARGV.push('--search') }
+    after { ARGV.pop }
+
+    context 'when argument with no search data' do
+      let(:out) { /Connection to Evostream REFUSED !!/ }
+      let(:code) { 201 }
+
+      include_examples 'argument exit'
+      include_examples 'argument output'
+    end
+
+    context 'when argument with search data', broken: true do
+      before { ARGV.push('id: 4') }
+      after { ARGV.pop }
+
+      let(:out) { /Connection to Evostream REFUSED !!/ }
+      let(:code) { 201 }
+
+      include_examples 'argument exit'
+      include_examples 'argument output'
+    end
+  end
+end

data/spec/cli/argument/version_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Evostream::CLI::Argument::Version do
+  let(:runner) { Evostream::Runner.new }
+  let(:out) { /##################################\n^# Ruby --.*\n^# Evostream::Event -- .*\n##################################/m }
+  let(:code) { 0 }
+
+  context 'when short argument' do
+    before { ARGV.push('-v') }
+    after { ARGV.pop }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
+  end
+
+  context 'when long argument' do
+    before { ARGV.push('--version') }
+    after { ARGV.pop }
+
+    include_examples 'argument exit'
+    include_examples 'argument output'
+  end
+end

data/spec/matchers/exit_code_matchers.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :terminate do |_code|
+  actual = nil
+
+  def supports_block_expectations?
+    true
+  end
+
+  match do |block|
+    actual = block.call
+    # puts "Actual : #{actual.inspect} -- #{@status_code}"
+    actual && actual == status_code
+  end
+
+  chain :with_code do |status_code|
+    # puts "Status Code : #{status_code}"
+    @status_code = status_code
+  end
+
+  failure_message do |_block|
+    "expected block to call exit(#{status_code}) but exit" +
+      (actual.nil? ? ' not called' : "(#{actual}) was called")
+  end
+
+  failure_message_when_negated do |_block|
+    "expected block not to call exit(#{status_code})"
+  end
+
+  description do
+    "expect block to call exit(#{status_code})"
+  end
+
+  def status_code
+    @status_code ||= 0
+  end
+end

data/spec/spec_helper.rb

@@ -16,6 +16,9 @@ Dir['spec/support/**/*.rb'].each do |f|
   require File.expand_path(f)
 end
 
+# Load custom matchers
+Dir['spec/matchers/*.rb'].each { |f| require File.expand_path(f) }
+
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
@@ -49,6 +52,11 @@ RSpec.configure do |config|
   config.before(:each, type: :response) do
     stub_request(:any, /server_stream.local/).to_rack(FakeEvostream)
   end
+
+  config.before(:each, type: :cli) do
+    server = double('server').as_null_object
+    TCPSocket.stub(:new).and_return(server)
+  end
 end
 
 # Class for testing

data/spec/support/examples_arguments.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'argument exit' do
+  it { expect { runner.run }.to terminate.with_code(code) }
+end
+
+RSpec.shared_examples 'argument output' do
+  it { expect { runner.run }.to output(out).to_stdout }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evostream-event
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.65
+  version: 1.0.0.pre.69
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -304,6 +304,7 @@ files:
 - lib/evostream/cli/option/host.rb
 - lib/evostream/cli/option/port.rb
 - lib/evostream/cli/option/search.rb
+- lib/evostream/cli/option/version.rb
 - lib/evostream/cli/runner.rb
 - lib/evostream/cli/search.rb
 - lib/evostream/event.rb
@@ -329,6 +330,12 @@ files:
 - lib/evostream/event/service.rb
 - lib/generators/evostream/initializer_generator.rb
 - spec/cli/argument/command_spec.rb
+- spec/cli/argument/config_spec.rb
+- spec/cli/argument/help_spec.rb
+- spec/cli/argument/host_spec.rb
+- spec/cli/argument/port_spec.rb
+- spec/cli/argument/search_spec.rb
+- spec/cli/argument/version_spec.rb
 - spec/evostream/action/action_spec.rb
 - spec/evostream/commands/create_dash_spec.rb
 - spec/evostream/commands/create_hls_spec.rb
@@ -346,8 +353,10 @@ files:
 - spec/evostream/evostream_event_spec.rb
 - spec/features/push_stream_spec.rb
 - spec/features/remove_config_spec.rb
+- spec/matchers/exit_code_matchers.rb
 - spec/spec_helper.rb
 - spec/support/examples_actions.rb
+- spec/support/examples_arguments.rb
 - spec/support/examples_commands.rb
 - spec/support/examples_events.rb
 - spec/support/fake_evostream.rb
@@ -386,7 +395,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"