hakiri 0.2.1 → 0.3.0

data/lib/hakiri/stack.rb

@@ -1,13 +1,13 @@
 require 'active_support/all'
 
 class Hakiri::Stack
-  attr_accessor :technologies, :default_path
+  attr_accessor :technologies, :default_command
 
   #
   # Initializes a stack.
   #
   def initialize()
-    @default_path = ''
+    @default_command = ''
     @technologies = {}
     @errors = []
   end
@@ -24,7 +24,7 @@ class Hakiri::Stack
 
   #
   # This method analyzes user input from the Hakiri gem and sets up
-  # default paths to retrieve versions.
+  # default commands to retrieve versions.
   #
   # @param [String] server
   #   Rails server selection.
@@ -42,51 +42,51 @@ class Hakiri::Stack
   #   Is Memcached present?
   #
   def build_from_input(server, extra_server, db, redis, memcached)
-    @technologies['ruby'] = { path: @default_path }
-    @technologies['ruby-on-rails'] = { path: @default_path }
+    @technologies['ruby'] = { command: @default_command }
+    @technologies['ruby-on-rails'] = { command: @default_command }
 
     case server
       when 1
-        @technologies['unicorn'] = { path: @default_path }
+        @technologies['unicorn'] = { command: @default_command }
       when 2
-        @technologies['phusion-passenger'] = { path: @default_path }
+        @technologies['phusion-passenger'] = { command: @default_command }
       when 3
-        @technologies['thin'] = { path: @default_path }
+        @technologies['thin'] = { command: @default_command }
       when 4
-        @technologies['trinidad'] = { path: @default_path }
-        @technologies['java'] = { path: @default_path }
-        @technologies['apache-tomcat'] = { path: @default_path }
-        @technologies['jruby'] = { path: @default_path }
+        @technologies['trinidad'] = { command: @default_command }
+        @technologies['java'] = { command: @default_command }
+        @technologies['apache-tomcat'] = { command: @default_command }
+        @technologies['jruby'] = { command: @default_command }
       else
         nil
     end
 
     case extra_server
       when 1
-        @technologies['apache'] = { path: @default_path }
+        @technologies['apache'] = { command: @default_command }
       when 2
-        @technologies['nginx'] = { path: @default_path }
+        @technologies['nginx'] = { command: @default_command }
       when 3
-        @technologies['apache'] = { path: @default_path }
-        @technologies['nginx'] = { path: @default_path }
+        @technologies['apache'] = { command: @default_command }
+        @technologies['nginx'] = { command: @default_command }
       else
         nil
     end
 
     case db
       when 1
-        @technologies['mysql'] = { path: @default_path }
+        @technologies['mysql'] = { command: @default_command }
       when 2
-        @technologies['postgres'] = { path: @default_path }
+        @technologies['postgres'] = { command: @default_command }
       when 3
-        @technologies['mongodb'] = { path: @default_path }
+        @technologies['mongodb'] = { command: @default_command }
       else
         nil
     end
 
-    @technologies['redis'] = { path: @default_path } if redis
+    @technologies['redis'] = { command: @default_command } if redis
 
-    @technologies['memcached'] = { path: @default_path } if memcached
+    @technologies['memcached'] = { command: @default_command } if memcached
   end
 
   #
@@ -99,7 +99,7 @@ class Hakiri::Stack
       @technologies[technology_slug].symbolize_keys!
 
       technology_class = Hakiri.const_get(technology_slug.gsub('-', '_').camelcase)
-      technology_object = technology_class.new(value[:path])
+      technology_object = technology_class.new(value[:command])
 
       if technology_object.version
         @technologies[technology_slug][:version] = technology_object.version unless @technologies[technology_slug][:version] and @technologies[technology_slug][:version] != ''

data/lib/hakiri/technologies/apache.rb

@@ -1,5 +1,5 @@
 class Hakiri::Apache < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Apache'
@@ -7,7 +7,7 @@ class Hakiri::Apache < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}httpd -v 2>&1 | awk 'NR == 1 { print ; }'`
+      output = (@command.empty?) ? `httpd -v 2>&1 | awk 'NR == 1 { print ; }'` : `#{@command} 2>&1 | awk 'NR == 1 { print ; }'`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/apache_tomcat.rb

@@ -1,5 +1,5 @@
 class Hakiri::ApacheTomcat < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Apache Tomcat'
@@ -7,7 +7,7 @@ class Hakiri::ApacheTomcat < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}trinidad -v 2>&1`
+      output = (@command.empty?) ? `trinidad -v 2>&1` : `#{@command} 2>&1`
       /\d+(\.\d+)?(\.\d+)?\)/.match(output)[0].gsub(/\)/, '')
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/java.rb

@@ -1,5 +1,5 @@
 class Hakiri::Java < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Java'
@@ -7,7 +7,7 @@ class Hakiri::Java < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}java -version 2>&1 | awk 'NR == 2 { print ; }'`
+      output = (@command.empty?) ? `java -version 2>&1 | awk 'NR == 2 { print ; }'` : `#{@command} 2>&1 | awk 'NR == 2 { print ; }'`
       /\d+(\.\d+)?(\.\d+)?(_\d+)?/.match(output)[0].gsub('_', '.')
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/jruby.rb

@@ -1,5 +1,5 @@
 class Hakiri::Jruby < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'JRuby'
@@ -7,7 +7,7 @@ class Hakiri::Jruby < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}jruby -v 2>&1 | awk 'NR == 2 { print ; }'`
+      output = (@command.empty?) ? `jruby -v 2>&1 | awk 'NR == 1 { print ; }'` : `#{@command} 2>&1 | awk 'NR == 1 { print ; }'`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/linux_kernel.rb

@@ -1,5 +1,5 @@
 class Hakiri::LinuxKernel < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Linux Kernel'
@@ -7,7 +7,7 @@ class Hakiri::LinuxKernel < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}uname -r  2>&1`
+      output = (@command.empty?) ? `uname -r  2>&1` : `#{@command} 2>&1`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/memcached.rb

@@ -1,5 +1,5 @@
 class Hakiri::Memcached < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Memcached'
@@ -7,7 +7,7 @@ class Hakiri::Memcached < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}memcached -h  2>&1 | awk 'NR == 1 { print ; }'`
+      output = (@command.empty?) ? `memcached -h  2>&1 | awk 'NR == 1 { print ; }'` : `#{@command} 2>&1 | awk 'NR == 1 { print ; }'`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/mongodb.rb

@@ -1,5 +1,5 @@
 class Hakiri::Mongodb < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'MongoDB'
@@ -7,7 +7,7 @@ class Hakiri::Mongodb < Hakiri::Technology
 
   def version
     begin
-      output = `ps -ax | grep mongo 2>&1`
+      output = (@command.empty?) ? `ps -ax | grep mongo 2>&1` : `#{@command} 2>&1`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)
@@ -16,6 +16,6 @@ class Hakiri::Mongodb < Hakiri::Technology
   end
 
   def puts_error(e, output)
-    puts "Error: couldn't find a running version of MongoDB"
+    say '!      Can\'t find MongoDB'
   end
 end

data/lib/hakiri/technologies/mysql.rb

@@ -1,5 +1,5 @@
 class Hakiri::Mysql < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'MySQL'
@@ -7,7 +7,7 @@ class Hakiri::Mysql < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}mysql -version 2>&1`
+      output = (@command.empty?) ? `mysql -version 2>&1` : `#{@command} 2>&1`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/nginx.rb

@@ -1,5 +1,5 @@
 class Hakiri::Nginx < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'nginx'
@@ -7,7 +7,7 @@ class Hakiri::Nginx < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}nginx -v 2>&1`
+      output = (@command.empty?) ? `nginx -v 2>&1` : `#{@command} 2>&1`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/phusion_passenger.rb

@@ -1,5 +1,5 @@
 class Hakiri::PhusionPassenger < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Phusion Passenger'
@@ -7,7 +7,7 @@ class Hakiri::PhusionPassenger < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}passenger -v 2>&1 | awk 'NR == 1 { print ; }'`
+      output = (@command.empty?) ? `passenger -v 2>&1 | awk 'NR == 1 { print ; }'` : `#{@command} 2>&1 | awk 'NR == 1 { print ; }'`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/postgres.rb

@@ -1,5 +1,5 @@
 class Hakiri::Postgres < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Postgres'
@@ -7,7 +7,7 @@ class Hakiri::Postgres < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}postgres -V 2>&1`
+      output = (@command.empty?) ? `postgres -V 2>&1` : `#{@command} 2>&1`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/redis.rb

@@ -1,5 +1,5 @@
 class Hakiri::Redis < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Redis'
@@ -7,7 +7,7 @@ class Hakiri::Redis < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}redis-server -v 2>&1`
+      output = (@command.empty?) ? `redis-server -v 2>&1` : `#{@command} 2>&1`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/ruby.rb

@@ -1,5 +1,5 @@
 class Hakiri::Ruby < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Ruby'
@@ -7,7 +7,7 @@ class Hakiri::Ruby < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}ruby -v 2>&1`
+      output = (@command.empty?) ? `ruby -v 2>&1` : `#{@command} 2>&1`
       /\d+(\.\d+)(\.\d+)(p\d+)/.match(output)[0].gsub('p', '.')
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/ruby_on_rails.rb

@@ -1,5 +1,5 @@
 class Hakiri::RubyOnRails < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Ruby on Rails'
@@ -7,7 +7,7 @@ class Hakiri::RubyOnRails < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}rails -v 2>&1`
+      output = (@command.empty?) ? `rails -v 2>&1` : `#{@command} 2>&1`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/technology.rb

@@ -3,9 +3,9 @@ class Hakiri::Technology
   #
   # Initializes a technology.
   #
-  def initialize(path = '')
-    @default_regexp = /\d+(\.\d+)(\.\d+)/
-    @path = path
+  def initialize(command = '')
+    @default_regexp = /\d+\.\d+\.\d+/
+    @command = command
     @name = 'Technology'
   end
 
@@ -19,6 +19,6 @@ class Hakiri::Technology
   #   System output from attempted version query.
   #
   def puts_error(e, output)
-    say "!      Can't find #{self.class.name.demodulize}: #{output.lines.first}"
+    say "!      Can't find #{name}: #{output.lines.first}"
   end
 end

data/lib/hakiri/technologies/thin.rb

@@ -1,5 +1,5 @@
 class Hakiri::Thin < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Thin'
@@ -7,7 +7,7 @@ class Hakiri::Thin < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}thin -v 2>&1`
+      output = (@command.empty?) ? `thin -v 2>&1` : `#{@command} 2>&1`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/technologies/trinidad.rb

@@ -1,5 +1,5 @@
 class Hakiri::Trinidad < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Trinidad'
@@ -7,7 +7,7 @@ class Hakiri::Trinidad < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}trinidad -v 2>&1 | awk 'NR == 2 { print ; }'`
+      output = (@command.empty?) ? `trinidad -v 2>&1 | awk 'NR == 2 { print ; }'` : `#{@command} 2>&1 | awk 'NR == 2 { print ; }'`
       puts output
       @default_regexp.match(output)[0]
     rescue Exception => e

data/lib/hakiri/technologies/unicorn.rb

@@ -1,5 +1,5 @@
 class Hakiri::Unicorn < Hakiri::Technology
-  def initialize(path = '')
+  def initialize(command = '')
     super
 
     @name = 'Unicorn'
@@ -7,7 +7,7 @@ class Hakiri::Unicorn < Hakiri::Technology
 
   def version
     begin
-      output = `#{@path}unicorn -v 2>&1`
+      output = (@command.empty?) ? `unicorn -v 2>&1` : `#{@command} 2>&1`
       @default_regexp.match(output)[0]
     rescue Exception => e
       puts_error(e, output)

data/lib/hakiri/version.rb

@@ -1,3 +1,3 @@
 module Hakiri
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hakiri
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Hakiri is a CLI for www.hakiriup.com—a cloud security platform for Ruby
-  on rails apps.
+  on Rails apps.
 email: vasinov@me.com
 executables:
 - hakiri
@@ -102,14 +118,16 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
+- Rakefile
 - bin/hakiri
 - hakiri.gemspec
 - lib/hakiri.rb
 - lib/hakiri/cli/cli.rb
-- lib/hakiri/cli/system_scan.rb
-- lib/hakiri/cli/system_steps.rb
-- lib/hakiri/cli/system_sync.rb
+- lib/hakiri/cli/manifest.json
+- lib/hakiri/cli/manifest.rb
+- lib/hakiri/cli/system.rb
 - lib/hakiri/http_client.rb
 - lib/hakiri/stack.rb
 - lib/hakiri/technologies/apache.rb
@@ -131,7 +149,6 @@ files:
 - lib/hakiri/technologies/trinidad.rb
 - lib/hakiri/technologies/unicorn.rb
 - lib/hakiri/version.rb
-- technologies.json
 homepage: http://www.hakiriup.com
 licenses:
 - MIT
@@ -156,5 +173,5 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: CLI for Hakiri
+summary: Secure Rails with Hakiri
 test_files: []