hakiri 0.3.1 → 0.3.2

data/.gitignore

@@ -16,3 +16,4 @@ capybara-*.html
 **.orig
 *.gem
 /manifest.json
+.ruby-version

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    hakiri (0.3.0)
+    hakiri (0.3.1)
       active_support
       commander
       i18n
+      json_pure
       rake
       rest-client
       terminal-table
@@ -19,6 +20,7 @@ GEM
       highline (~> 1.6.11)
     highline (1.6.19)
     i18n (0.6.4)
+    json_pure (1.8.0)
     mime-types (1.23)
     rake (10.1.0)
     rest-client (1.6.7)

data/README.md

@@ -27,7 +27,7 @@ Hakiri CLI is a Ruby gem that can be installed by
 $ gem install hakiri
 ~~~
 
-After it's installed, restart your command line and you should be good to go.
+After it's installed, restart your command line and you should be good to go. Hakiri supports Ruby 1.8.7, 1.9.x and 2.0.x.
 
 ## Test Your System in 2 Minutes
 
@@ -121,4 +121,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/hakiri

@@ -26,7 +26,7 @@ command 'system:scan' do |c|
   c.option '--manifest STRING', String, 'Path to your manifest JSON file'
 
   c.action do |args, options|
-    options.default manifest: './manifest.json'
+    options.default :manifest => './manifest.json'
 
     cli = Hakiri::System.new(args, options)
     cli.scan
@@ -42,8 +42,8 @@ command 'system:sync' do |c|
   c.option '--force', 'Force syncing without asking for it first.'
 
   c.action do |args, options|
-    options.default manifest: './manifest.json'
-    options.default project: nil
+    options.default :manifest => './manifest.json'
+    options.default :project => nil
     cli = Hakiri::System.new(args, options)
     cli.sync
   end

data/hakiri.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'active_support'
   s.add_dependency 'i18n'
   s.add_dependency 'rest-client'
+  s.add_dependency 'json_pure'
 end

data/lib/hakiri.rb

@@ -4,6 +4,7 @@ end
 
 require 'terminal-table'
 require 'open-uri'
+require 'json'
 
 require 'hakiri/cli/cli'
 require 'hakiri/cli/system'

data/lib/hakiri/cli/manifest.rb

@@ -8,7 +8,7 @@ class Hakiri::Manifest < Hakiri::Cli
     FileUtils::copy_file "#{File.dirname(__FILE__)}/manifest.json", "#{Dir.pwd}/manifest.json"
     File.chmod 0755, "#{Dir.pwd}/manifest.json"
     say '-----> Generating the manifest file...'
-    say "-----> Generated the manifest file in #{Dir.pwd}/manifest.json"
-    say "-----> Edit it and run \"hakiri system:scan\""
+    say "       Generated the manifest file in #{Dir.pwd}/manifest.json"
+    say "       Edit it and run \"hakiri system:scan\""
   end
 end

data/lib/hakiri/cli/system.rb

@@ -19,7 +19,7 @@ class Hakiri::System < Hakiri::Cli
 
         # GETTING VULNERABILITIES
         say '-----> Searching for vulnerabilities...'
-        params = ({ technologies: @stack.technologies }.to_param)
+        params = ({ :technologies => @stack.technologies }.to_param)
         response = @http_client.get_issues(params)
 
         if response[:errors]
@@ -79,7 +79,7 @@ class Hakiri::System < Hakiri::Cli
         end
 
         # CHECK VERSIONS ON THE SERVER
-        params = ({ project_id: @options.project, technologies: @stack.technologies }.to_param)
+        params = ({ :project_id => @options.project, :technologies => @stack.technologies }.to_param)
         say '-----> Checking software versions on www.hakiriup.com...'
         response = @http_client.check_versions_diff(params)
 
@@ -92,7 +92,7 @@ class Hakiri::System < Hakiri::Cli
             @stack.technologies = {}
             response[:diffs].each do |diff|
               if diff[:success]
-                @stack.technologies[diff[:technology][:slug]] = { version: diff[:system_version] }
+                @stack.technologies[diff[:technology][:slug]] = { :version => diff[:system_version] }
 
                 if diff[:hakiri_version]
                   if diff[:system_version_newer]
@@ -115,7 +115,7 @@ class Hakiri::System < Hakiri::Cli
 
             if update or @options.force
               say '-----> Syncing versions with www.hakiriup.com...'
-              params = ({ project_id: @options.project, technologies: @stack.technologies }.to_param)
+              params = ({ :project_id => @options.project, :technologies => @stack.technologies }.to_param)
               response = @http_client.sync_project_versions(response[:project][:id], params)
 
               if response[:errors]
@@ -193,7 +193,7 @@ class Hakiri::System < Hakiri::Cli
       end
 
       say '-----> Searching for vulnerabilities...'
-      params = ({ technologies: @stack.technologies }.to_param)
+      params = ({ :technologies => @stack.technologies }.to_param)
       response = @http_client.get_issues(params)
 
       if response[:errors]
@@ -209,7 +209,6 @@ class Hakiri::System < Hakiri::Cli
           response[:technologies].each do |technology|
             unless technology[:issues_count] == 0
               say "!      Found #{technology[:issues_count].to_i} #{'vulnerability'.pluralize if technology[:issues_count].to_i != 1} in #{technology[:name]} #{technology[:version]}"
-              puts ' '
             end
           end
 

data/lib/hakiri/http_client.rb

@@ -27,9 +27,9 @@ class Hakiri::HttpClient
     RestClient.get "#{@api_url}/issues.json?auth_token=#{@auth_token}&#{params}" do |response, request, result, &block|
       case response.code
         when 200
-          JSON.parse(response.to_str, symbolize_names: true)
+          JSON.parse(response.to_str, :symbolize_names => true)
         else
-          { errors: [response.code] }
+          { :errors => [response.code] }
       end
     end
   end
@@ -47,9 +47,9 @@ class Hakiri::HttpClient
     RestClient.get "#{@api_url}/versions/diffs.json?auth_token=#{@auth_token}&#{params}" do |response, request, result, &block|
       case response.code
         when 200
-          JSON.parse(response.to_str, symbolize_names: true)
+          JSON.parse(response.to_str, :symbolize_names => true)
         else
-          { errors: [response.code] }
+          { :errors => [response.code] }
       end
     end
   end
@@ -67,9 +67,9 @@ class Hakiri::HttpClient
     RestClient.put "#{@api_url}/projects/#{project_id}.json?auth_token=#{@auth_token}", params do |response, request, result, &block|
       case response.code
         when 200
-          JSON.parse(response.to_str, symbolize_names: true)
+          JSON.parse(response.to_str, :symbolize_names => true)
         else
-          { errors: [response.code] }
+          { :errors => [response.code] }
       end
     end
   end

data/lib/hakiri/stack.rb

@@ -42,51 +42,51 @@ class Hakiri::Stack
   #   Is Memcached present?
   #
   def build_from_input(server, extra_server, db, redis, memcached)
-    @technologies['ruby'] = { command: @default_command }
-    @technologies['ruby-on-rails'] = { command: @default_command }
+    @technologies['ruby'] = { :command => @default_command }
+    @technologies['ruby-on-rails'] = { :command => @default_command }
 
     case server
       when 1
-        @technologies['unicorn'] = { command: @default_command }
+        @technologies['unicorn'] = { :command => @default_command }
       when 2
-        @technologies['phusion-passenger'] = { command: @default_command }
+        @technologies['phusion-passenger'] = { :command => @default_command }
       when 3
-        @technologies['thin'] = { command: @default_command }
+        @technologies['thin'] = { :command => @default_command }
       when 4
-        @technologies['trinidad'] = { command: @default_command }
-        @technologies['java'] = { command: @default_command }
-        @technologies['apache-tomcat'] = { command: @default_command }
-        @technologies['jruby'] = { command: @default_command }
+        @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'] = { command: @default_command }
+        @technologies['apache'] = { :command => @default_command }
       when 2
-        @technologies['nginx'] = { command: @default_command }
+        @technologies['nginx'] = { :command => @default_command }
       when 3
-        @technologies['apache'] = { command: @default_command }
-        @technologies['nginx'] = { command: @default_command }
+        @technologies['apache'] = { :command => @default_command }
+        @technologies['nginx'] = { :command => @default_command }
       else
         nil
     end
 
     case db
       when 1
-        @technologies['mysql'] = { command: @default_command }
+        @technologies['mysql'] = { :command => @default_command }
       when 2
-        @technologies['postgres'] = { command: @default_command }
+        @technologies['postgres'] = { :command => @default_command }
       when 3
-        @technologies['mongodb'] = { command: @default_command }
+        @technologies['mongodb'] = { :command => @default_command }
       else
         nil
     end
 
-    @technologies['redis'] = { command: @default_command } if redis
+    @technologies['redis'] = { :command => @default_command } if redis
 
-    @technologies['memcached'] = { command: @default_command } if memcached
+    @technologies['memcached'] = { :command => @default_command } if memcached
   end
 
   #

data/lib/hakiri/version.rb

@@ -1,3 +1,3 @@
 module Hakiri
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hakiri
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  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'
 description: Hakiri is a CLI for www.hakiriup.com—a cloud security platform for Ruby
   on Rails apps.
 email: vasinov@me.com