command_exec 0.0.3 → 0.1.0

data/Gemfile

@@ -1,24 +1,23 @@
-source "https://rubygems.org"
+source :rubygems
 
-# Specify your gem's dependencies in ruby-pdflatex.gemspec
+# Specify your gem's dependencies in workplace-letter_generator.gemspec
 gemspec
 
-group :development do
-  gem 'cucumber'
-  gem 'fakefs'
-  gem 'fuubar'
-  gem 'github-markup'
-  gem 'guard'
-  gem 'guard-cucumber'
-  gem 'guard-rspec'
-  gem 'guard-yard'
-  gem 'libnotify'
-  gem 'pry'
-  gem 'rb-inotify'
-  gem 'rb-readline'
-  gem 'redcarpet' , '~>1.17.2'
+group :test do
+  gem 'rake'
   gem 'rspec'
+  gem 'tmrb'
   gem 'simplecov'
-  gem 'terminal_multiplexer'
+  gem 'aruba'
+  gem 'fuubar'
+end
+
+group :documentation do
   gem 'yard'
+  gem 'redcarpet'
+  gem 'github-markup'
+end
+
+group :development do
+  gem 'tmrb'
 end

data/Gemfile.lock

@@ -1,60 +1,44 @@
 PATH
   remote: .
   specs:
-    command_exec (0.0.2)
+    command_exec (0.1.0)
       POpen4
       colored
 
 GEM
-  remote: https://rubygems.org/
+  remote: http://rubygems.org/
   specs:
     POpen4 (0.1.4)
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
     builder (3.0.0)
-    coderay (1.0.5)
+    childprocess (0.3.4)
+      ffi (~> 1.0, >= 1.0.6)
     colored (1.2)
-    cucumber (1.1.9)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
-    fakefs (0.4.0)
-    ffi (1.0.11)
+    ffi (1.1.0)
     fuubar (1.0.0)
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
       ruby-progressbar (~> 0.0.10)
-    gherkin (2.9.1)
+    gherkin (2.11.1)
       json (>= 1.4.6)
     github-markup (0.7.1)
-    guard (1.0.1)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-cucumber (0.7.5)
-      cucumber (>= 0.10)
-      guard (>= 0.8.3)
-    guard-rspec (0.6.0)
-      guard (>= 0.10.0)
-    guard-yard (1.0.2)
-      guard (>= 0.2.2)
-      yard (>= 0.7.0)
-    highline (1.6.11)
-    json (1.6.5)
-    libnotify (0.7.2)
-    method_source (0.7.1)
+    json (1.7.3)
     multi_json (1.1.0)
     open4 (1.3.0)
-    pry (0.9.8.4)
-      coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
-    rb-readline (0.4.2)
+    rake (0.9.2.2)
     redcarpet (1.17.2)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
@@ -70,32 +54,22 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    slop (2.4.4)
-    term-ansicolor (1.0.7)
-    terminal_multiplexer (1.0.2)
-      highline
-    thor (0.14.6)
+    thor (0.15.4)
+    tmrb (1.2.7)
+      thor
     yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  aruba
   command_exec!
-  cucumber
-  fakefs
   fuubar
   github-markup
-  guard
-  guard-cucumber
-  guard-rspec
-  guard-yard
-  libnotify
-  pry
-  rb-inotify
-  rb-readline
-  redcarpet (~> 1.17.2)
+  rake
+  redcarpet
   rspec
   simplecov
-  terminal_multiplexer
+  tmrb
   yard

data/Rakefile

@@ -1 +1,49 @@
-require "bundler/gem_tasks"
+#!/usr/bin/env rake
+require 'bundler/gem_tasks'
+require 'yard'
+require 'rubygems/package_task'
+
+YARD::Rake::YardocTask.new do |t|
+  t.files   = ['lib/**/*.rb', 'README.md', 'LICENCE.md']
+  t.options = ['--output-dir=doc/yard', '--markup-provider=redcarpet', '--markup=markdown' ]
+end
+
+task :terminal do
+  sh "script/terminal"
+end
+
+task :term => :terminal
+task :t => :terminal
+
+namespace :version do
+  version_file = Dir.glob('lib/**/version.rb').first
+
+  task :bump do
+
+    new_version = ENV['VERSION']
+
+    version_string = %Q{ module DataUri
+        VERSION = '#{new_version}'
+    end}
+
+    File.open(version_file, "w") do |f|
+      f.write version_string.strip_heredoc
+    end
+
+    sh "git add #{version_file}" 
+    sh "git commit -m 'version bump to #{new_version}'" 
+    sh "git tag data_uri-#{new_version}" 
+  end
+
+  task :show do
+    raw_version = File.open(version_file, "r").readlines.grep(/VERSION/).first
+
+    if raw_version
+      version = raw_version.chomp.match(/VERSION\s+=\s+["']([^'"]+)["']/) { $1 }
+      puts version
+    else
+      warn "Could not parse version file \"#{version_file}\""
+    end
+
+  end
+end

data/lib/command_exec/command.rb

@@ -1,9 +1,5 @@
 # encoding: utf-8
 
-require 'popen4'
-require 'colored'
-require 'logger'
-
 # Classes concerning command execution
 module CommandExec
   # Run commands
@@ -31,7 +27,7 @@ module CommandExec
         :error_keywords => [],
         :working_directory => Dir.pwd,
         :logfile => '',
-        :debug => false,
+        :log_level => :info,
       }.update opts
 
       @logger = @opts[:logger] 
@@ -41,6 +37,8 @@ module CommandExec
       @error_keywords = @opts[:error_keywords]
       @logfile = @opts[:logfile]
 
+      configure_logging
+
       @working_directory = @opts[:working_directory] 
       Dir.chdir(working_directory)
 
@@ -48,6 +46,27 @@ module CommandExec
 
     private
 
+    def configure_logging
+      case @opts[:log_level]
+      when :debug
+        @logger.level = Logger::DEBUG
+      when :error
+        @logger.level = Logger::ERROR
+      when :fatal
+        @logger.level = Logger::FATAL
+      when :info
+        @logger.level = Logger::INFO
+      when :unknown
+        @logger.level = Logger::UNKNOWN
+      when :warn
+        @logger.level = Logger::WARN
+      when :silent
+        @logger.instance_variable_set(:@logdev, nil)
+      else
+        log_level = Logger::INFO
+      end
+    end
+
     # Find utility path
     #
     # @param [Symbol] name Name of utility
@@ -61,7 +80,7 @@ module CommandExec
         raise Exceptions::CommandNotFound 
       end
 
-      return path
+      path
     end
 
     # Build string to execute command
@@ -73,20 +92,17 @@ module CommandExec
       cmd += options.empty? ? "" : " #{options}"
       cmd += parameter.empty? ? "" : " #{parameter}"
 
-      return cmd
+      cmd
     end
 
-    # Checks for errors
-    #
-    # @raise [String] 
-
     public
 
     # Output the textual representation of a command
+    # public alias for build_cmd_string
     #
     # @return [String] command in text form
-    def to_txt
-      return build_cmd_string
+    def to_txt 
+      build_cmd_string
     end
 
     # Run the program
@@ -125,8 +141,7 @@ module CommandExec
 
       @logger.info "#{@name.to_s}: #{msg}"
 
-      return @result
-
+      @result
     end
 
     # Read the content of the logfile
@@ -144,7 +159,7 @@ module CommandExec
         end
       end
 
-      return content
+      content
     end
 
     # Decide if a program run was successful
@@ -184,8 +199,7 @@ module CommandExec
         result << stdout 
       end
 
-      return result
-
+      result
     end
 
     # Find error in stdout
@@ -203,8 +217,7 @@ module CommandExec
         end
       end
 
-      return error_found
-
+      error_found
     end
 
     # Generate the message which is return to the user
@@ -221,7 +234,7 @@ module CommandExec
         message.concat msg.flatten
       end
 
-      return message.join("\n")
+      message.join("\n")
     end
 
     # Constructur to initiate a new command and run it later
@@ -231,7 +244,7 @@ module CommandExec
       command = new(name,opts)
       command.run
 
-      return command
+      command
     end
 
   end

data/lib/command_exec/version.rb

@@ -1,3 +1,3 @@
 module CommandExec
-    VERSION = "0.0.3"
+  VERSION='0.1.0'
 end

data/lib/command_exec.rb

@@ -1,6 +1,11 @@
+#encoding: utf-8
+
+require 'popen4'
+require 'colored'
+require 'logger'
+
 require 'command_exec/version'
 require 'command_exec/exceptions'
 require 'command_exec/command'
 
-module CommandExec
-end
+module CommandExec; end

data/script/terminal

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'tmrb'
+
+tmux = TmRb::Multiplexer.new
+#creates an empty window
+tmux.new_session(session_name: 'command_exec')
+
+tmux.new_window(:name => 'code', :command => "zsh -c 'vim -p lib/**/*.rb'")
+tmux.new_window(:name => 'spec', :command => "zsh -c 'vim -p spec/**/*.rb'")
+tmux.new_window(:name => 'features', :command => "zsh -c 'vim -p features/**/*.{rb,feature}'")
+tmux.start

data/spec/command/command_spec.rb

@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 describe Command do
-  let(:logger) {Logger.new('/dev/null')}
+  let(:logger) {Logger.new(StringIO.new)}
   #let(:logger) {Logger.new($stdout)}
-  let(:debug) {false}
-  #let(:debug) {true}
-  let(:command) { Command.new(:echo , :debug=>debug, :logger => logger, :parameter => "hello world" , :error_keywords => %q[abc def], :working_directory => '/tmp' ) }
+  let(:log_level) {:info}
+  let(:command) { Command.new(:echo , :log_level => :silent, :logger => logger, :parameter => "hello world" , :error_keywords => %q[abc def], :working_directory => '/tmp' ) }
 
 
   it "has a path" do
@@ -30,7 +29,7 @@ describe Command do
   end
 
   it "can be used to construct a command string, which can be executed" do
-    command = Command.new(:pdflatex, :debug => debug, :logger => logger, :parameter => "index.tex blub.tex", :options => "-a -b")
+    command = Command.new(:pdflatex, :log_level => :silent, :logger => logger, :parameter => "index.tex blub.tex", :options => "-a -b")
     command.send(:build_cmd_string).should == "/usr/bin/pdflatex -a -b index.tex blub.tex"
   end
 
@@ -44,17 +43,17 @@ describe Command do
   end
 
   it "execute existing programs" do
-    command = Command.execute(:echo, :debug => debug, :logger => logger ,:parameter => "index.tex blub.tex", :options => "-- -a -b")
+    command = Command.execute(:echo, :log_level => :silent, :logger => logger ,:parameter => "index.tex blub.tex", :options => "-- -a -b")
     command.result.should == true
   end
   
   it "does not execute non-existing programs" do
-    command = Command.execute(:grep, :debug => debug, :logger => logger, :parameter => "index.tex blub.tex", :options => "-- -a -b")
+    command = Command.execute(:grep, :log_level => :silent, :logger => logger, :parameter => "index.tex blub.tex", :options => "-- -a -b")
     command.result.should == false
   end
 
   it "checks if errors have happend during execution" do
-    lambda { Command.new(:echo1, :debug => debug, :logger => logger, :parameter => "index.tex blub.tex", :options => "-- -a -b") }.should raise_error CommandNotFound
+    lambda { Command.new(:echo1, :log_level => :silent, :logger => logger, :parameter => "index.tex blub.tex", :options => "-- -a -b") }.should raise_error CommandNotFound
   end
 
   it "decides which output should be returned to the user" do
@@ -95,6 +94,32 @@ describe Command do
     command.send(:message, true ).should == "\e[1m\e[32mOK\e[0m\e[0m"
   end
 
+  it "is very verbose and returns a lot of output" do
+    bucket = StringIO.new
+    logger = Logger.new(bucket)
+    Command.execute(:echo, :logger => logger ,:parameter => "index.tex blub.tex", :options => "-- -a -b" , :log_level => :debug)
+
+    bucket.string.should =~ /OK/
+  end
+
+  it "is silent and returns no output" do
+    bucket = StringIO.new
+    logger = Logger.new(bucket)
+    Command.execute(:echo, :logger => logger ,:parameter => "index.tex blub.tex", :options => "-- -a -b" , :log_level => :silent)
+
+    bucket.string.should == ""
+  end
+
+  # not completed
+  #it "use a log file if given" do
+  #  application_log_file = Tempfile.new('command_exec_test') 
+  #  application_log_file.write "ERROR"
+
+  #  binding.pry
+  #  Command.execute(:echo, :logger => logger ,:parameter => "index.tex blub.tex", :options => "-- -a -b" , :log_level => :silent, :logfile => application_log_file, :error_keywords => %W[ERROR])
+
+  #end
+
 
 
 end

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ $LOAD_PATH << File.expand_path('../lib' , File.dirname(__FILE__))
 require 'pry'
 require 'stringio'
 
+require 'tempfile'
+
 require 'simplecov'
 SimpleCov.start
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: command_exec
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: POpen4
-  requirement: &16707080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16707080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &16706660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16706660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This adds bells and whistles to ease shell command execution
 email:
 - dev@fedux.org
@@ -54,6 +64,7 @@ files:
 - lib/command_exec/exceptions.rb
 - lib/command_exec/spec_helper_module.rb
 - lib/command_exec/version.rb
+- script/terminal
 - spec/command/command_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -76,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Helper gem to exectue arbitrary shell commands