sourceninja 0.0.8 → 0.9.0

data/lib/sourceninja/sourceninja.rb

@@ -4,7 +4,15 @@ require 'json'
 module Sourceninja
   include HTTParty
 
-  @@base_uri = "https://app.sourceninja.com"
+  @@BASE_URI = "https://app.sourceninja.com/rubygems/1_0"
+
+  def self.log(msg)
+    if defined? Rails
+      Rails.logger.info msg
+    else
+      $stderr.puts msg
+    end
+  end
 
   def self.process_bundle_info
     # all we need in the dep list is the name of the module. the version number here won't be important because
@@ -12,13 +20,9 @@ module Sourceninja
     dep_list = {}
     Bundler.environment.dependencies.to_a.map{|b| b.to_s}.each do |dep|
       unless dep =~ %r{^\s*(\S+)}
-        if defined? Rails
-          Rails.logger.info "Sourceninja: Could not find the package name for #{dep.to_s}"
-        end
-
+        log("Sourceninja: Could not find the package name for #{dep.to_s}")
         next
       end
-
       dep_list[$1] = true
     end
 
@@ -26,68 +30,51 @@ module Sourceninja
     spec_hash = Bundler.environment.specs.to_hash
     spec_hash.keys.each do |key|
       unless %r{Gem::Specification name=#{key} version=([\d.]+)} =~ spec_hash[key][0].to_s
-        if defined? Rails
-          Rails.logger.info "Sourceninja: Could not parse information for gem #{key}: #{spec_hash[key]}"
-        else
-          $stderr.puts "Sourceninja: Could not parse information for gem #{key}: #{spec_hash[key]}"
-        end
+        log("Sourceninja: Could not parse information for gem #{key}: #{spec_hash[key]}")
         next
       end
       package_data << { :package_name => key, :package_version => $1, :direct_requirement => (dep_list[key] || false) }
     end
 
     if package_data.empty?
-      if defined? Rails
-        Rails.logger.info "Sourceninja: Did not successfully parse any packages, will not attempt to upload information"
-      end
-
+      log("Sourceninja: Did not successfully parse any packages, will not attempt to upload information")
       return
     end
 
     package_data
   end
 
-  def self.send_package_info(package_data_hash)
-    if defined? Rails
-      Rails.logger.debug "Sourceninja: Attempting to send package information to SourceNinja"
-    end
-
-    base_uri = @@base_uri
-
-    if not ENV['SOURCENINJA_UPLOAD_URL'].nil? and ENV['SOURCENINJA_UPLOAD_URL'] != ""
-      if defined? Rails
-        Rails.logger.debug "Sourceninja: using #{ENV['SOURCENINJA_UPLOAD_URL']} for the upload URI"
-      end
-
-      base_uri = ENV['SOURCENINJA_UPLOAD_URL']
+  def self.send_package_info(package_data_hash, options={})
+    defaults = {
+      :url => ENV['SOURCENINJA_UPLOAD_URL'] ? ENV['SOURCENINJA_UPLOAD_URL'] : @@BASE_URI,
+      :token => ENV['SOURCENINJA_TOKEN'],
+      :product_id => ENV['SOURCENINJA_PRODUCT_ID']
+    }
+    options = defaults.merge(options)
+
+    if options[:token].nil? or options[:token] == ""
+      log("Sourceninja: No token set, not uploading information to SourceNinja")
+      return false
     end
 
-    if ENV['SOURCENINJA_TOKEN'].nil? or ENV['SOURCENINJA_TOKEN'] == ""
-      if defined? Rails
-        Rails.logger.debug "Sourceninja: No SOURCENINJA_TOKEN set, not uploading information to SourceNinja"
-      end
-
-      return
+    if options[:product_id].nil? or options[:product_id] == ""
+      log("Sourceninja: No product ID set, not uploading information to SourceNinja")
+      return false
     end
 
-    if ENV['SOURCENINJA_PRODUCT_ID'].nil? or ENV['SOURCENINJA_PRODUCT_ID'] == ""
-      if defined? Rails
-        Rails.logger.debug "Sourceninja: No SOURCENINJA_PRODUCT_ID set, not uploading information to SourceNinja"
-      end
+    params = { :id => options[:product_id], :token => options[:token], :package_info => { :package_details => package_data_hash }.to_json }
+    # log("Sourceninja: Attempting to send package_info of #{params.to_s} to #{[options[:url],'rubygems/1_0'].join('/')}")
 
-      return
+    response = nil
+    begin
+      log("Sourceninja: Sending package information to SourceNinja")
+      response = HTTParty.post(options[:url], :body => params)
+    rescue Exception => e
+      log("Sourceninja: Error submitting data: #{e.message}")
+      return false
     end
 
-    params = { :id => ENV['SOURCENINJA_PRODUCT_ID'], :token => ENV['SOURCENINJA_TOKEN'], :package_info => { :package_details => package_data_hash }.to_json }
-
-    if defined? Rails
-      Rails.logger.debug "Sourceninja: Attempting to send package_info of #{params.to_s} to #{[base_uri,'rubygems/1_0'].join('/')}"
-    end
-
-    response = HTTParty.post([base_uri,'rubygems/1_0'].join('/'), :body => params )
-
-    if defined? Rails
-      Rails.logger.debug "Sourceninja: Got back status #{response.code}"
-    end
+    log("Sourceninja: Received status #{response.code}")
+    return response.code == 200
   end
 end

data/lib/sourceninja/version.rb

@@ -1,3 +1,3 @@
 module Sourceninja
-  VERSION = "0.0.8"
+  VERSION = "0.9.0"
 end

data/sourceninja.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["SourceNinja"]
   s.email       = ["support@sourceninja.com"]
   s.homepage    = "http://www.sourceninja.com"
-  s.summary     = %q{Integration with SourceNinja software tracking.}
-  s.description = %q{Integration with SourceNinja software tracking. Will allow a user to scan their installed gemlist and automatically populate their product within the SourceNinja system.}
+  s.summary     = "Integration with SourceNinja software tracking."
+  s.description = "Integration with SourceNinja software tracking. Will allow a user to scan their installed gemlist and automatically populate their product within the SourceNinja system."
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json"
   s.add_dependency "httparty"
+  s.add_development_dependency "rspec"
 end

data/spec/lib/sourceninja/sourceninja_spec.rb

@@ -0,0 +1,67 @@
+require 'rspec'
+require 'spec_helper'
+
+
+describe Sourceninja do
+
+  describe "process_bundle_info" do
+
+    it "should return an array of hashes" do
+      Sourceninja.process_bundle_info.class.should == Array
+      Sourceninja.process_bundle_info.all?(&Hash.method(:===)).should == true
+      Sourceninja.process_bundle_info.each { |e|
+        e.include?(:package_name).should == true
+        e.include?(:package_version).should == true
+        e.include?(:direct_requirement).should == true
+      }
+    end
+
+    it "check for direct and our named indirect deps" do
+      direct_gems = ["rspec", "sourceninja"]
+      indirect_gems = ["httparty", "json"]
+
+      direct_gems.each do |d|
+        bundle_info = Sourceninja.process_bundle_info
+        rcov_result = bundle_info.select { |e| e[:package_name] == d }
+        rcov_result.count.should == 1
+        rcov_result.first[:package_name].should == d
+        rcov_result.first[:direct_requirement].should == true
+      end
+
+      indirect_gems.each do |d|
+        bundle_info = Sourceninja.process_bundle_info
+        rcov_result = bundle_info.select { |e| e[:package_name] == d }
+        rcov_result.count.should == 1
+        rcov_result.first[:package_name].should == d
+        rcov_result.first[:direct_requirement].should == false
+      end
+    end
+  end
+
+  it "make sure the list of hashes is being submitted to SN" do
+    data = [{:package_name => "bundler", :package_version => "1.1.3", :direct_requirement => false},
+            {:package_name => "sourceninja", :package_version => "0.0.8", :direct_requirement => true}]
+
+    response = mock(HTTParty::Response)
+    response.stub!(:code).and_return(200)
+    HTTParty.stub(:post).with("https://app.sourceninja.com/rubygems/1_0",
+                              {:body => { :id => "product_id",
+                                  :token => "token",
+                                  :package_info => { :package_details => data }.to_json }}).and_return(response)
+
+    Sourceninja.send_package_info(data,
+                                  :token => "token",
+                                  :product_id => "product_id").should == true
+  end
+
+  it "make sure invalid URLs don't crash the app" do
+    data = [{:package_name => "bundler", :package_version => "1.1.3", :direct_requirement => false},
+            {:package_name => "sourceninja", :package_version => "0.0.8", :direct_requirement => true}]
+
+    Sourceninja.send_package_info(data,
+                                  :url => "blargl",
+                                  :token => "token",
+                                  :product_id => "product_id").should == false
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'rubygems'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'sourceninja'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sourceninja
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Integration with SourceNinja software tracking. Will allow a user to
   scan their installed gemlist and automatically populate their product within the
   SourceNinja system.
@@ -65,6 +81,8 @@ files:
 - lib/sourceninja/sourceninja.rb
 - lib/sourceninja/version.rb
 - sourceninja.gemspec
+- spec/lib/sourceninja/sourceninja_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.sourceninja.com
 licenses: []
 post_install_message: 
@@ -85,8 +103,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Integration with SourceNinja software tracking.
-test_files: []
+test_files:
+- spec/lib/sourceninja/sourceninja_spec.rb
+- spec/spec_helper.rb