codercmp 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7eb5cfcf5bedbc117d1fd4f9f4d0c4283abf372
-  data.tar.gz: 590499c02a93be6bc554b245876fd728789b9506
+  metadata.gz: 33f172e7819122536245dbe189b28fcf0c146160
+  data.tar.gz: acfcd56950dc3c875d2d3ff4becbb6a5c3e64196
 SHA512:
-  metadata.gz: 898f86b675cb21ed3cdba632f0d7978cc36f9d2ad52f3ea8d695badf9db9646537ee0ee60c5be27c6baf080fba33f1d3d4784523f73407e9ecbfc512c6bdaa32
-  data.tar.gz: 39b2dc40462b7fba5c0d673d314250ac4e6f46131e8a06376d601a71f3af093cfedc667cf7ad2419c0252d6c0cb37b95ea54446012aea4fbebcface0d832c7a9
+  metadata.gz: acf252f2ca33a3dd64f8b1a5d6a6f18ebdd5db0e5c945bcdba39d7e8ff20b4ea7d6525742ebe1a5a76713e1b62530857f5dce63309aeae6cd364e7fb76c80375
+  data.tar.gz: 115addcac50bfbac07452c93db2274a3e7b6482c3f6d0560bdd20695fcfa536d104ff0747b421ac0fe4e69c252c5db0c2f305692c04203d321ffdba145d5813b

data/bin/codercmp

@@ -56,9 +56,14 @@ INFO
         options[:no_color] = !val
     end
 
-    opts.on( "--show-output", "-o", "Display the output after parsing the project") do
+    opts.on( "--show-output", "Display the output after parsing the project") do
         options[:show_output] = true
     end 
+
+    opts.on( "--output-file FILE", "-o FILE", "Output to a json file instead of uploading to codercompanion") do |file_name|
+        puts file_name
+        options[:output_file] = file_name
+    end
     
     opts.on( "--dry-run", "Performs dry run. Does not actually upload data. The purpose of this command is to test the parsing of your files. " +
                 "Becomes even more useful when used with --show-output to see the result of the parse") do
@@ -73,7 +78,7 @@ INFO
     end
 
     opts.on( "--languages", "-l", "Get the supported languages") do
-        CoderCompanion.display_supported_languages
+        CoderCompanion::CLI.display_supported_languages
         exit 0
     end
 
@@ -94,7 +99,7 @@ option_parser.parse!
 
 options[:exclude] = exclude
 begin
-    CoderCompanion::start(options, location)
+    CoderCompanion::CLI.new(options, location).run
 rescue CoderCompanion::CoderCompanionException => e
     CoderCompanion::j_print CoderCompanion::error_format(e.message)
     exit 1

data/lib/codercompanion.rb

@@ -1,4 +1,3 @@
-# TODO: change to use instance instead of static/class methods for all
 $:.push File.expand_path(File.dirname(__FILE__) )
 
 require 'yard'
@@ -11,6 +10,7 @@ require 'treetop'
 require 'colored'
 require 'aws-sdk'
 require 'codercompanion/codercompanion_exception'
+require 'codercompanion/visual_message'
 require 'codercompanion/ruby/ruby_annotations'
 require 'codercompanion/languages'
 require 'codercompanion/parser_factory'
@@ -36,375 +36,293 @@ end
 
 module CoderCompanion
 
-    BASEPATH            = File.expand_path('..', File.dirname(__FILE__) )
-
-    STATUS_OK           = 200
-    USER_NOT_FOUND      = 461
-    PROJECT_NOT_FOUND   = 510
-    GENERIC_ERROR       = 500
-
     CONFIG_FILE_NAME    = 'codercmp.conf'
 
-    # @return [Hash]
-    @@options                           = {}
-
-    # @return [Hash]
-    @@config                            = nil
-
-    # @return [String]
-    @@visit_config_location_message     = ""
+    @@no_color                          = false
     
-    # @return [String]
-    @@src_folder                    = ""
-
-    # @return [CoderCompanion::API]
-    @@api = CoderCompanion::API.new
-
-    def self.init
-=begin
------------------------------------------------------------------------------------------------
-
-                                   __-¯--__
-                              __-¯¯        ¯¯--__
-                         __-¯¯                   ¯¯-___,
-                       /¯-__                   __-¯¯__  |
-                       |    ¯¯--__        __-¯¯__-¯¯  | |
-                       |          ¯--__-¯¯__-¯¯       | |
-                       |             | r¯¯       ¯¯   | |
-                       |             | |   O          | |
-                       L             | |            _-| |
-                        `~__         | |       __-¯¯__-¯¯ 
-                            `~__     | |  __-¯¯__-¯¯  __-¯¯`~__
-                                `~__ | '¯¯__-¯¯  __-¯¯         ;-
-                                    `L_-¯¯  __-¯¯         __-¯¯
-                                       __-¯¯         __-¯¯
-                                      `~_       __-¯¯
-                                         `~__-¯¯
-            #{special_format("R u n n i n g   C o d e r   C o m p a n i o n   u p l o a d e r")}
-        
------------------------------------------------------------------------------------------------
-=end
-        j_print <<INFO 
------------------------------------------------------------------------------------------------
+    class << self
+        def j_print(string)
+            puts string if !silent_run
+        end
 
-            #{special_format("R u n n i n g   C o d e r   C o m p a n i o n   u p l o a d e r")}
-        
------------------------------------------------------------------------------------------------
-INFO
-        @@visit_config_location_message = error_format("Please visit ") + error_url_format("http://codercompanion.com") + error_format(" for more info")
-        
-        # Using config_filename otherwise default to 'codercmp.conf' in pwd
-        config_filename = @@options[:config_file] ? @@options[:config_file] : "#{CONFIG_FILE_NAME}"
-
-        file = nil
-        begin
-            file = File.open(config_filename)
-        rescue => e
-            j_print e.to_s
-            raise CoderCompanionException.new(error_format("An error occured while trying to open the configuration file"))
+        def j_print_inline(string)
+            print string if !silent_run
         end
 
-        begin
-            @@config = JSON.parse(file.read)
-        rescue => e
-            j_print error_format e.to_s
-            raise CoderCompanionException.new(error_format("could not parse your config file. ") + @@visit_config_location_message)
+        # @param [String] string
+        def special_format(string)
+            return no_color ? string : string.white_on_black.bold
         end
-        
-        verify_config_file
-    end
 
-    def self.base_path
-        BASEPATH
-    end
+        # @param [String] string
+        def warning_format(string)
+            return no_color ? string : string.black_on_yellow.bold
+        end
 
-    def self.j_print(string)
-        puts string if !silent_run
-    end
+        # @param [String] string
+        def error_format(string)
+            return no_color ? string : string.white_on_red.bold
+        end
 
-    def self.j_print_inline(string)
-        print string if !silent_run
-    end
-    
-    # @return [CoderCompanion::CacheHandler]
-    def self.cache_handler
-        @@cache_handler
-    end
+        # @param [String] string
+        def error_url_format(string)
+            return no_color ? string : string.yellow_on_red.bold.underline
+        end
 
-    # @return [Boolean]
-    def self.dry_run?
-        @@options[:dry_run]
-    end
+        # @param [String] string
+        def red_format(string)
+            return no_color ? string : string.red_on_black.bold
+        end
 
-    # @return [Boolean]
-    def self.silent_run
-        @@options[:silent_run]
-    end
+        # @param [String] string
+        def notification_format(string)
+            return no_color ? string : string.yellow_on_black
+        end
 
-    # @return [Boolean]
-    def self.fresh_run
-        @@options[:fresh_run]
-    end
+        # @param [String] string
+        def success_format(string)
+            return no_color ? string : string.green_on_black.bold
+        end
 
-    # @return [Boolean]
-    def self.no_color
-        @@options[:no_color]
-    end
+        def pretty_inspect(thing)
+            begin 
+                thing.awesome_inspect
+            rescue
+                thing.inspect
+            end
+        end
 
-    def self.excluded
-        @@options[:exclude]
-    end
+        # @param no_color [Boolean]
+        def no_color=(no_color)
+            @@no_color = no_color
+        end
+        
+        # @return [Boolean]
+        def no_color
+            @@no_color
+        end
 
-    # @return [Object]
-    def self.config
-        @@config
-    end
+        # @param silent_run [Boolean]
+        def silent_run=(silent_run)
+            @@silent_run = silent_run
+        end
 
-    # @return [String]
-    def self.language
-        @@language
+        # @return [Boolean]
+        def silent_run
+            @@silent_run
+        end
     end
 
-    # @param language [String] the language
-    def self.language=(language)
-        @@language = language
-    end
+    class CLI
+        attr_reader :cache_handler, :src_folder, :api, :options, :config, :language
 
-    # @return [String]
-    def self.annotation
-        @@annotation
-    end
+        def initialize(options = {}, location)
+            @options = options
+            @src_folder = location
+            @cache_handler = CacheHandler.new options[:dry_run]
 
-    # @param annotation [String] the annotation type
-    def self.annotation=(annotation)
-        @@annotation = annotation
-    end
+            CoderCompanion.no_color = options[:no_color]
+            CoderCompanion.silent_run = options[:silent_run]
+    
+            print_greeting
+            @config = parse_config_file
+            verify_config @config
+
+            @api = API.new({
+                :access_key     => @config["project"]["access_key"],
+                :access_id      => @config["user"]["access_id"],
+                :host           => @config["host"]
+            })
+        end
 
-    # @param [String] string
-    def self.special_format(string)
-        return CoderCompanion.no_color ? string : string.white_on_black.bold
-    end
+        # @return [Boolean]
+        def dry_run?
+            options[:dry_run]
+        end
 
-    # @param [String] string
-    def self.warning_format(string)
-        return CoderCompanion.no_color ? string : string.black_on_yellow.bold
-    end
+        # @return [String]
+        def output_file
+            options[:output_file]
+        end
 
-    # @param [String] string
-    def self.error_format(string)
-        return CoderCompanion.no_color ? string : string.white_on_red.bold
-    end
+        # @return [Boolean]
+        def fresh_run
+            options[:fresh_run]
+        end
 
-    # @param [String] string
-    def self.error_url_format(string)
-        return CoderCompanion.no_color ? string : string.yellow_on_red.bold.underline
-    end
+        def excluded
+            options[:exclude]
+        end
 
-    # @param [String] string
-    def self.red_format(string)
-        return CoderCompanion.no_color ? string : string.red_on_black.bold
-    end
+        def print_greeting
+            ::CoderCompanion.j_print VisualMessage.get_greeting_text
+        end
 
-    # @param [String] string
-    def self.notification_format(string)
-        return CoderCompanion.no_color ? string : string.yellow_on_black
-    end
+        def parse_config_file
+            @@visit_config_location_message = ::CoderCompanion.error_format("Please visit ") + ::CoderCompanion.error_url_format("http://codercompanion.com") + ::CoderCompanion.error_format(" for more info")
+            
+            # Using config_filename otherwise default to 'codercmp.conf' in pwd
+            config_filename = options[:config_file] ? options[:config_file] : "#{CONFIG_FILE_NAME}"
+
+            file = nil
+            begin
+                file = File.open(config_filename)
+            rescue => e
+                ::CoderCompanion.j_print e.to_s
+                raise CoderCompanionException.new(::CoderCompanion.error_format("An error occured while trying to open the configuration file"))
+            end
 
-    # @param [String] string
-    def self.success_format(string)
-        return CoderCompanion.no_color ? string : string.green_on_black.bold
-    end
+            begin
+                return JSON.parse(file.read)
+            rescue => e
+                ::CoderCompanion.j_print ::CoderCompanion.error_format e.to_s
+                raise CoderCompanionException.new(::CoderCompanion.error_format("could not parse your config file. ") + @@visit_config_location_message)
+            end
+            
+        end
 
-    def self.verify_config_file
-        j_print notification_format("Verifying Config file...")
-        error = false
-        if @@config
-            if @@config["project"]
-                if @@config["project"]["access_key"] == nil || @@config["project"]["access_key"].match(/^\s*$/)
-                    j_print error_format("No access_key for project specified.")
-                    error = true
-                end
+        def verify_config config
+            ::CoderCompanion.j_print ::CoderCompanion.notification_format("Verifying Config file...")
+            error = false
+            if config
+                if config["project"]
+                    if config["project"]["access_key"] == nil || config["project"]["access_key"].match(/^\s*$/)
+                        ::CoderCompanion.j_print ::CoderCompanion.error_format("No access_key for project specified.")
+                        error = true
+                    end
 
-                is_supported = true
-                self.language = @@config["project"]["language"]
-                if self.language == nil || self.language.match(/^\s*$/)
-                    j_print error_format("No language specified in your config file.")
-                    error = true
-                elsif !CoderCompanion::Languages.is_supported?(self.language)
-                    is_supported = false
-                    j_print error_format("#{self.language} is not a supported language")
-                    j_print notification_format("To see a list of supported languages run: \n\tcodercmp --language\n")
+                    is_supported = true
+                    @language = config["project"]["language"]
+                    if language == nil || language.match(/^\s*$/)
+                        ::CoderCompanion.j_print ::CoderCompanion.error_format("No language specified in your config file.")
+                        error = true
+                    elsif !Languages.is_supported?(language)
+                        is_supported = false
+                        ::CoderCompanion.j_print ::CoderCompanion.error_format("#{language} is not a supported language")
+                        ::CoderCompanion.j_print ::CoderCompanion.notification_format("To see a list of supported languages run: \n\tcodercmp --language\n")
+                        error = true
+                    end
+                else
+                    ::CoderCompanion.j_print ::CoderCompanion.error_format("Project not found in config file. ") 
                     error = true
                 end
-=begin -- Validation when multiple annotation options is allowed
-                if !error && is_supported
-                    self.annotation = @@config["project"]["annotation"]
-                    languages = CoderCompanion::Languages.supported_languages
-                    language_details = nil
-                    languages.each do |lang|
-                        language_details = (lang[:key] == language) ? lang : nil
-                        if language_details
-                            break
-                        end
-                    end
-                    if language_details && language_details[:annotation_required] && (self.annotation == nil || self.annotation.match(/^\s*$/))
-                        j_print error_format("#{self.language} is supported but must make use of ONE of the following annotations styles: #{language_details[:valid_annotation].join(", ")}")
+                if config["user"]
+                    if config["user"]["access_id"] == nil || config["user"]["access_id"] == ""
+                        ::CoderCompanion.j_print ::CoderCompanion.error_format("No access_id for project specified.")
                         error = true
                     end
+                else
+                    ::CoderCompanion.j_print ::CoderCompanion.error_format("User info not found")
+                    error = true
                 end
-=end
-            else
-                j_print error_format("Project not found in config file. ") 
-                error = true
-            end
-            if @@config["user"]
-                if @@config["user"]["access_id"] == nil || @@config["user"]["access_id"] == ""
-                    j_print error_format("No access_id for project specified.")
+                if config["host"] == nil || config["host"] == ""
+                    ::CoderCompanion.j_print ::CoderCompanion.error_format("Host not found")
                     error = true
                 end
-            else
-                j_print error_format("User info not found")
-                error = true
             end
-            if @@config["host"] == nil || @@config["host"] == ""
-                j_print error_format("Host not found")
-                error = true
-            end
-        end
-
-        if error
-            raise CoderCompanionException.new(@@visit_config_location_message)
-        end
-
-        j_print success_format("Config file Successfully Verified")
-    end
-
-    def self.pretty_inspect(thing)
-        begin 
-            thing.awesome_inspect
-        rescue
-            thing.inspect
-        end
-    end
-
-    def self.display_supported_languages
-        languages = CoderCompanion::Languages.supported_languages
-puts <<INFO
----------------------------------------------------------------------------------------------
-
-                    #{CoderCompanion::notification_format("CoderCompanion Supported Languages (2015-05-30)")}
-
----------------------------------------------------------------------------------------------
-INFO
-
-        languages.each do |lang|
 
-puts <<INFO
+            if error
+                raise CoderCompanionException.new(@@visit_config_location_message)
+            end
 
-        Language: #{CoderCompanion::notification_format(lang[:key])}\t\t|\t Requires Annotations: #{lang[:annotation_required] ? CoderCompanion::success_format("YES") : CoderCompanion::red_format("NO") }\t\t|\tAnnotations Style(s): #{(lang[:annotation_required]) ? CoderCompanion::notification_format(lang[:valid_annotation].join(", ")) : CoderCompanion::notification_format("N/A")}
-        
-INFO
+            ::CoderCompanion.j_print ::CoderCompanion.success_format("Config file Successfully Verified")
         end
-    end
-
-    def self.run
-        if self.dry_run?
-           
-j_print <<INFO
-
-#{notification_format("Performing dry run:")}
-    - No cache use
-    - No upload           
-
-INFO
 
+        def self.display_supported_languages
+            languages = CoderCompanion::Languages.supported_languages
+            puts VisualMessage.supported_languages_header
+            languages.each do |lang|
+                puts VisualMessage.supported_language_row lang
+            end
         end
 
+        def run
+            if self.dry_run?
+                CoderCompanion.j_print VisualMessage.dry_run_text
+            end
 
-        @@cache_handler = CacheHandler.new
-        @@cache_handler.load_cache(fresh_run)
-        
-            
-        p = CoderCompanion::ParserFactory.get_parser(self.language)
+            cache_handler.load_cache(fresh_run)
+                
+            p = CoderCompanion::ParserFactory.get_parser(language)
 
-        # Running test for different languages
-        uploadable = p.create_project_json(@@src_folder)
+            # Running test for different languages
+            uploadable = p.create_project_json(src_folder, excluded, cache_handler)
 
-        if @@options[:show_output]
-            ap uploadable
-        end
+            if options[:show_output]
+                ap uploadable
+            end
 
-        if !uploadable
-            j_print error_format("Something went wrong while trying to create uploadable")
-            return
-        end
+            if !uploadable
+                ::CoderCompanion.j_print ::CoderCompanion.error_format("Something went wrong while trying to create uploadable")
+                return
+            end
 
 
-        if !self.dry_run? 
-            #puts pretty_inspect(uploadable)
-            # Maybe wrap this in a begin--rescue block
-            # Uncomment this
-            file_rel_path = './test_upload.codercompanion'
-            File.open(file_rel_path, 'w+') {|f| f.write(uploadable.to_json) }
+            if !dry_run? 
+                #puts pretty_inspect(uploadable)
+                # Maybe wrap this in a begin--rescue block
+                # Uncomment this
 
-            #zip file here
+                file_rel_path = './test_upload.codercompanion'
+                if output_file
+                    ::CoderCompanion.j_print ::CoderCompanion.notification_format("saving output to #{output_file}")
+                    file_rel_path = output_file
+                end
+                File.open(file_rel_path, 'w+') {|f| f.write(uploadable.to_json) }
+                
+                if output_file
+                    ::CoderCompanion.j_print ::CoderCompanion.success_format("Successfully saved the output")
+                    return
+                end
+                #zip file here
 
-            j_print notification_format("uploading to #{@@config["host"]}...")
+                ::CoderCompanion.j_print ::CoderCompanion.notification_format("uploading to #{config["host"]}...")
 
-            # Uncomment this
-            # Upload file to be processed
-            upload(file_rel_path)
+                # Uncomment this
+                # Upload file to be processed
+                upload(file_rel_path)
 
-            File.delete(file_rel_path)
-            self.cache_handler.write_cached_data
-            j_print success_format("Uploaded your changes successfully")
+                File.delete(file_rel_path)
+                cache_handler.write_cached_data
+                ::CoderCompanion.j_print ::CoderCompanion.success_format("Uploaded your changes successfully")
+            end
         end
-    end
 
-    def self.upload(file)
-        response = @@api.get_temporary_access_key
-        unless response
-            File.delete(file)
-            raise CoderCompanion::CoderCompanionException, "Failed to upload project"
-        end
+        def upload(file)
+            response = api.get_temporary_access_key
+            unless response
+                File.delete(file)
+                raise CoderCompanion::CoderCompanionException, "Failed to upload project"
+            end
 
-        response_data = JSON.parse(response)["data"]
-        credentials = response_data["credentials"]
-        region = response_data["region"]
-        s3_bucket = response_data["s3_bucket"]
-        s3_client = CoderCompanion::S3Client.new(
-            :session_token => credentials["session_token"], 
-            :access_key_id => credentials["access_key_id"], 
-            :secret_access_key => credentials["secret_access_key"], 
-            :region => region, 
-            :s3_bucket => s3_bucket 
-        )
-
-        current_time = Time.now.utc.strftime("%Y-%m-%d:%H:%M:%S")
-        key = "#{@@config["user"]["access_id"]}/#{@@config["project"]["access_key"]}/#{current_time}/upload"
-
-        # put object using the s3_client
-        result = s3_client.put_object(file, key)
-        unless result
-            File.delete(file)
-            raise CoderCompanion::CoderCompanionException, "Failed to upload file to S3"
-        end 
-
-        # notify the api that we have uploaded the file to s3
-        response = @@api.notify_s3_upload(key)
-        unless response
-            File.delete(file)
-            raise CoderCompanion::CoderCompanionException, "Failed to complete upload. It is possible our servers are down"
+            response_data = JSON.parse(response)["data"]
+            credentials = response_data["credentials"]
+            region = response_data["region"]
+            s3_bucket = response_data["s3_bucket"]
+            s3_client = CoderCompanion::S3Client.new(
+                :session_token => credentials["session_token"], 
+                :access_key_id => credentials["access_key_id"], 
+                :secret_access_key => credentials["secret_access_key"], 
+                :region => region, 
+                :s3_bucket => s3_bucket 
+            )
+
+            current_time = Time.now.utc.strftime("%Y-%m-%d:%H:%M:%S")
+            key = "#{config["user"]["access_id"]}/#{config["project"]["access_key"]}/#{current_time}/upload"
+
+            # put object using the s3_client
+            result = s3_client.put_object(file, key)
+            unless result
+                File.delete(file)
+                raise CoderCompanion::CoderCompanionException, "Failed to upload file to S3"
+            end 
+
+            # notify the api that we have uploaded the file to s3
+            response = api.notify_s3_upload(key)
+            unless response
+                File.delete(file)
+                raise CoderCompanion::CoderCompanionException, "Failed to complete upload. It is possible our servers are down"
+            end
         end
     end
-
-    def self.start(options, location)
-        @@options = options
-        
-        @@src_folder = location
-        
-        self.init
-        self.run
-    end
-
 end

data/lib/codercompanion/api.rb

@@ -1,18 +1,25 @@
 module CoderCompanion
     class API
-        def initialize()
-            # puts CoderCompanion::config
+        STATUS_OK           = 200
+        USER_NOT_FOUND      = 461
+        PROJECT_NOT_FOUND   = 510
+        GENERIC_ERROR       = 500
+
+        attr_reader :config
+
+        def initialize(config={})
+            @config = config
         end
 
         def upload(file)
             response = nil
             begin
-                response = RestClient.post(CoderCompanion::config["host"] + '/update_project.json', :myfile => File.new(file),# /Users/oseghale/Projects/JinglePage/JingleParser/test_upload.jingle'), 
-                                            :access_key => CoderCompanion::config["project"]["access_key"], :access_id => CoderCompanion::config["user"]["access_id"]) { |response, request, result, &block|
+                response = RestClient.post(config[:host] + '/update_project.json', :myfile => File.new(file),# /Users/oseghale/Projects/JinglePage/JingleParser/test_upload.jingle'), 
+                                            :access_key => config[:access_key], :access_id => config[:access_id]) { |response, request, result, &block|
                     return response.code || nil 
                 }
             rescue
-                return CoderCompanion::GENERIC_ERROR
+                return GENERIC_ERROR
                 
             end
             
@@ -20,10 +27,10 @@ module CoderCompanion
 
         def get_temporary_access_key
             begin 
-                RestClient.post("#{CoderCompanion::config["host"]}/project/get_temporary_access_key.json", 
-                            :access_key => CoderCompanion::config["project"]["access_key"], 
-                            :access_id => CoderCompanion::config["user"]["access_id"]) { |response, request, result, &block|
-                    return (response.code == CoderCompanion::STATUS_OK) ? response : nil
+                RestClient.post("#{config[:host]}/project/get_temporary_access_key.json", 
+                            :access_key => config[:access_key], 
+                            :access_id => config[:access_id]) { |response, request, result, &block|
+                    return (response.code == STATUS_OK) ? response : nil
                 }
             rescue
                 return nil
@@ -32,11 +39,11 @@ module CoderCompanion
 
         def notify_s3_upload(key)
             begin 
-                RestClient.post("#{CoderCompanion::config["host"]}/project/notify_project_upload.json", 
+                RestClient.post("#{config[:host]}/project/notify_project_upload.json", 
                             :s3_key => key,
-                            :access_key => CoderCompanion::config["project"]["access_key"], 
-                            :access_id => CoderCompanion::config["user"]["access_id"]) { |response, request, result, &block|
-                    return (response.code == CoderCompanion::STATUS_OK) ? response : nil
+                            :access_key => config[:access_key], 
+                            :access_id => config[:access_id]) { |response, request, result, &block|
+                    return (response.code == STATUS_OK) ? response : nil
                 }
             rescue
                 return nil

data/lib/codercompanion/cachehandler.rb

@@ -4,9 +4,12 @@ module CoderCompanion
         
         # @return [Object]
         attr_accessor :file_cache
+        
+        attr_reader :dry_run
        
-        def initialize
+        def initialize(dry_run=false)
             @file_cache = {}
+            @dry_run = dry_run
         end
          
         # @return [File, nil]
@@ -22,12 +25,11 @@ module CoderCompanion
 
         # @param fresh_run [Boolean] should we use cache for this run?
         def load_cache(fresh_run)
-            if !CoderCompanion.dry_run?
-                if fresh_run
-                    delete_cache
-                else
-                    find_cache    
-                end
+            return if dry_run
+            if fresh_run
+                delete_cache
+            else
+                find_cache    
             end
         end
 
@@ -42,36 +44,34 @@ module CoderCompanion
         end
         
         def delete_cache
-            if !CoderCompanion.dry_run?
-                begin
-                    File.delete(CACHE_DIR + '/cache.data')
-                    CoderCompanion::j_print CoderCompanion::warning_format("Running a fresh sesh")
-                rescue
-                    CoderCompanion::j_print CoderCompanion::warning_format("No cache to delete. Running a fresh sesh")
-                end
+            return if dry_run
+            begin
+                File.delete(CACHE_DIR + '/cache.data')
+                CoderCompanion::j_print CoderCompanion::warning_format("Running a fresh sesh")
+            rescue
+                CoderCompanion::j_print CoderCompanion::warning_format("No cache to delete. Running a fresh sesh")
             end
         end
 
         # @param [String] file_path
         def update_cache_path(file_path)
-            if !CoderCompanion.dry_run?
-                if !self.file_cache
-                    self.file_cache = {}
-                end
-                self.file_cache[file_path] = encrypt(File.open(file_path).read)
+            return if dry_run
+
+            if !self.file_cache
+                self.file_cache = {}
             end
+            self.file_cache[file_path] = encrypt(File.open(file_path).read)
         end
 
         # @return [nil]
         def write_cached_data
-            if !CoderCompanion.dry_run?
-                if !Dir.exists?(CACHE_DIR)
-                    Dir.mkdir(CACHE_DIR)
-                end
-                File.open(CACHE_DIR + '/cache.data', 'w+') do |f| 
-                    f.write(self.file_cache.to_json)
-                end 
+            return if dry_run
+            if !Dir.exists?(CACHE_DIR)
+                Dir.mkdir(CACHE_DIR)
             end
+            File.open(CACHE_DIR + '/cache.data', 'w+') do |f| 
+                f.write(self.file_cache.to_json)
+            end 
         end
 
         # @return [JSON]

data/lib/codercompanion/java/java_parser.rb

@@ -20,7 +20,6 @@ module CoderCompanion
             end
 
             def parse_file(file)
-                CoderCompanion::j_print_inline CoderCompanion::success_format '.'
                 data = File.open(file).read
                 tree = @parser.parse(data)
                 
@@ -47,6 +46,7 @@ module CoderCompanion
                 end
                 
                 ast = self.build_tree(tree)
+                CoderCompanion::j_print_inline CoderCompanion::success_format '.'
                 {:type => 'source', :body => ast, :file_path => file}
             end
 

data/lib/codercompanion/java/java_tree_walker.rb

@@ -27,10 +27,9 @@ module CoderCompanion
                 return value
             end
 
-            def create_uploadable(results)
+            def create_uploadable(results, cache_handler)
                 obj = {}
                 results.each do |source|
-                    cache_handler = CoderCompanion.cache_handler
                     modified = cache_handler.is_file_modified?(source[:file_path])
                     cache_handler.update_cache_path(source[:file_path])
                     source[:body].each do |element|

data/lib/codercompanion/language_parser.rb

@@ -3,16 +3,21 @@ module CoderCompanion
 
         # @return [TreeWalker]
         attr_reader :tree_walker
+        
+        # @return [Array<String>]
+        attr_accessor :excluded
 
         # Parses and creates the json that will be uploaded
         # @param [String] dir_name
+        # @param [Array<String>] excluded_files
         # @return [Hash]
-        def create_project_json(dir_name)
+        def create_project_json(dir_name, excluded_files, cache_handler)
+            self.excluded = excluded_files
             files = get_parseable_files(dir_name)
             CoderCompanion::j_print CoderCompanion::notification_format("Parsing files...")
             results = parse(files)
             CoderCompanion::j_print CoderCompanion::success_format("\nSuccessfully parsed source code")
-            tree_walker.create_uploadable(results)
+            tree_walker.create_uploadable(results, cache_handler)
         end
 
         # Parse the files 
@@ -34,7 +39,7 @@ module CoderCompanion
             Dir.foreach(dir_name) do |item|
                 next if item == '.' or item == '..'
                 path = File.join(dir_name, item).gsub(/^(\.\/)?/, '') # Remove the leading ./ in the file name
-                next if CoderCompanion.excluded.include?(path)
+                next if excluded.include?(path)
                 if File.directory?(path)
                     construct_array(path, res_arr)
                 else

data/lib/codercompanion/ruby/ruby_parser.rb

@@ -1,5 +1,3 @@
-require 'byebug'
-require 'rdoc/rdoc'
 module CoderCompanion
     module Ruby
         class RubyParser < LanguageParser
@@ -38,6 +36,7 @@ module CoderCompanion
                 YARD::Registry.clear
                 YARD.parse(file)
                 results = YARD::Registry.all(:root, :module, :class, :method, :classvariable)
+                CoderCompanion::j_print_inline CoderCompanion::success_format '.'
                 {:type => 'source', :body => results, :file_path => file}
             end
         end

data/lib/codercompanion/ruby/ruby_tree_walker.rb

@@ -3,17 +3,17 @@ module CoderCompanion
         class RubyTreeWalker < CoderCompanion::TreeWalker
             
             # @param [Array<Hash>] results
+            # @param [CacheHandler] cache_handler
             # @return [Hash] 
-            def create_uploadable(results)
-                return build(results) 
+            def create_uploadable(results, cache_handler)
+                return build(results, cache_handler) 
             end
             
             # @param results [Array<Hash>] the results from parsing the code
             # @return [Hash]
-            def build(results)
+            def build(results, cache_handler)
                 obj = {}
                 results.each do |source|
-                    cache_handler = CoderCompanion.cache_handler
                     modified = cache_handler.is_file_modified?(source[:file_path])
                     cache_handler.update_cache_path(source[:file_path])
 

data/lib/codercompanion/tree_walker.rb

@@ -1,7 +1,8 @@
 module CoderCompanion
     class TreeWalker
         # @param [Array<Hash>] results The result hash to be converted into an uploadeable
-        def create_uploadable(results)
+        # @param cache_handler [CacheHandler]
+        def create_uploadable(results, cache_handler)
             raise NotImplementedError, "#{self.class}: 'create_uploadable' must be overriden"
         end
     end

data/lib/codercompanion/visual_message.rb

@@ -0,0 +1,66 @@
+module CoderCompanion
+    module VisualMessage
+        
+        def self.get_greeting_text
+=begin
+-----------------------------------------------------------------------------------------------
+
+                                   __-¯--__
+                              __-¯¯        ¯¯--__
+                         __-¯¯                   ¯¯-___,
+                       /¯-__                   __-¯¯__  |
+                       |    ¯¯--__        __-¯¯__-¯¯  | |
+                       |          ¯--__-¯¯__-¯¯       | |
+                       |             | r¯¯       ¯¯   | |
+                       |             | |   O          | |
+                       L             | |            _-| |
+                        `~__         | |       __-¯¯__-¯¯ 
+                            `~__     | |  __-¯¯__-¯¯  __-¯¯`~__
+                                `~__ | '¯¯__-¯¯  __-¯¯         ;-
+                                    `L_-¯¯  __-¯¯         __-¯¯
+                                       __-¯¯         __-¯¯
+                                      `~_       __-¯¯
+                                         `~__-¯¯
+            #{special_format("R u n n i n g   C o d e r   C o m p a n i o n   u p l o a d e r")}
+        
+-----------------------------------------------------------------------------------------------
+=end
+        return <<INFO 
+-----------------------------------------------------------------------------------------------
+
+            #{::CoderCompanion.special_format("R u n n i n g   C o d e r   C o m p a n i o n   u p l o a d e r")}
+        
+-----------------------------------------------------------------------------------------------
+INFO
+        end       
+
+        def self.supported_languages_header
+            return <<INFO
+-----------------------------------------------------------------------------------------------
+
+                    #{CoderCompanion::notification_format("CoderCompanion Supported Languages (2015-05-30)")}
+
+-----------------------------------------------------------------------------------------------
+INFO
+        end
+
+        def self.supported_language_row lang
+            return <<INFO
+
+        Language: #{::CoderCompanion.notification_format(lang[:key])}\t\t|\t Requires Annotations: #{lang[:annotation_required] ? ::CoderCompanion.success_format("YES") : ::CoderCompanion.red_format("NO") }\t\t|\tAnnotations Style(s): #{(lang[:annotation_required]) ? ::CoderCompanion.notification_format(lang[:valid_annotation].join(", ")) : ::CoderCompanion.notification_format("N/A")}
+        
+INFO
+        end
+
+        def self.dry_run_text
+            return <<INFO
+
+#{CoderCompanion.notification_format("Performing dry run:")}
+    - No cache use
+    - No upload           
+
+INFO
+
+        end
+    end
+end

data/lib/codercompanion_version.rb

@@ -1,3 +1,3 @@
 module CoderCompanion
-    VERSION = '0.9.7'
+    VERSION = '0.9.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codercmp
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Sega Okhiria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -94,6 +94,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
 description: codercmp is a gem intended for use as a command line interface to parse
   and upload code architecture and object structure to CoderCompanion.
 email:
@@ -125,6 +153,7 @@ files:
 - lib/codercompanion/ruby/ruby_tree_walker.rb
 - lib/codercompanion/s3_client.rb
 - lib/codercompanion/tree_walker.rb
+- lib/codercompanion/visual_message.rb
 - lib/codercompanion_version.rb
 homepage: ''
 licenses: