diggit 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fbc5e12f3c7806df481b5627dc5f904f89428c5
-  data.tar.gz: 6600fc64a91b44b386795d16a792caa11f12d932
+  metadata.gz: ea02ededd6c7a3836496975d8d994a75e131c4dc
+  data.tar.gz: efb7cd6e4cabca46c43449a71de61ed52b9233e9
 SHA512:
-  metadata.gz: 5defc137d1d9cd066c730c4c2d01b2da01bd7f848866cd01888caf6b97fea24377e293ddfc66ade5f03f9b6742ca3bc177b611762a30deb697b9fe6ff894f326
-  data.tar.gz: 535718d8f71f8f088f08c08bab2edb33e8e270db0e928a208d26c273c4a71b445863060ec2157175adb33fc33292e8120ba4d0df94931f96a1589db783a800ed
+  metadata.gz: a4eddd07d9a7102df17b2b8841d3f3c10ef11c1c60cb3d035cf43c3af5bcdc91c4adb5caa4ed814ab8d74dc97c8f6ff41ed0c98d43af3f9e76395163cb85d861
+  data.tar.gz: 59a4947128381985ad25d2b27aaa52b12ec48362c4cda8c0b885919fdab9504d54579dc15f29e5f841682e20c536e9e622c36df86fd82980d64a36dfa7e4bd13

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog of Diggit
 
+### Version 2.0.2
+* Fixed analysis cleaning
+* Fixed error in gemspec
+* Now rspec is launched after rubocop.
+* Dgit binary now takes a `-f` flag to indicates folder
+* It is now possible to deletes joins and analyses from a dgit folder
+* The `clone` commands has been renamed `clones` for consistency sake
+
 ### Version 2.0.1
 * Removed `errors`command, merged with subcommands of `sources`
 * Added a lot of documentation

data/bin/dgit

@@ -17,202 +17,211 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 require 'gli'
 require_relative '../lib/dgit'
 
-include GLI::App
+module Diggit
+	include GLI::App
 
-program_desc 'A git repository analysis tool.'
+	extend self
+	program_desc 'A git repository analysis tool.'
 
-switch [:v, :verbose], default_value: false, negatable: false, desc: "Indicates if the debug information are visible."
+	switch [:v, :verbose], default_value: false, negatable: false, desc: "Indicates if the debug information are visible."
+	flag [:f, :folder], default_value: ".", desc: "Path to the diggit folder. Default: current folder."
 
-version Diggit::VERSION
+	version Diggit::VERSION
 
-subcommand_option_handling :normal
-arguments :strict
+	subcommand_option_handling :normal
+	arguments :strict
 
-desc 'Init a diggit folder.'
-skips_pre
-command :init do |c|
-	c.action do |_global_options, _options, _args|
-		Diggit::Dig.init_dir
-		Log.ok "Diggit folder initialized."
+	desc 'Init a diggit folder.'
+	skips_pre
+	command :init do |c|
+		c.action do |globals, _options, _args|
+			Diggit::Dig.init_dir globals[:f]
+			Log.ok "Diggit folder initialized."
+		end
 	end
-end
 
-desc 'Display the status of the diggit folder.'
-command :status do |c|
-	c.action do |_global_options, _options, _args|
-		Log.info "Config"
-		Log.info "======"
-		Log.info "- Analyses: #{Diggit::Dig.it.config.get_analyses.join(', ')}"
-		Log.info "- Joins: #{Diggit::Dig.it.config.get_joins.join(', ')}"
-		Log.info ""
-		Log.info "Journal"
-		Log.info "======="
-		Log.info "- New sources:"
-		Log.indent do
-			Log.ok "* Ok: #{Diggit::Dig.it.journal.sources_by_state(:new).size}"
-			Log.error "* Error: #{Diggit::Dig.it.journal.sources_by_state(:new, true).size}"
-		end
-		Log.info "- Cloned sources:"
-		Log.indent do
-			Log.ok "* Ok: #{Diggit::Dig.it.journal.sources_by_state(:cloned).size}"
-			Log.error "* Error: #{Diggit::Dig.it.journal.sources_by_state(:cloned, true).size}"
+	desc 'Display the status of the diggit folder.'
+	command :status do |c|
+		c.action do |_global_options, _options, _args|
+			Log.info "Config"
+			Log.info "======"
+			Log.info "- Analyses: #{Diggit::Dig.it.config.get_analyses.join(', ')}"
+			Log.info "- Joins: #{Diggit::Dig.it.config.get_joins.join(', ')}"
+			Log.info ""
+			Log.info "Journal"
+			Log.info "======="
+			Log.info "- New sources:"
+			Log.indent do
+				Log.ok "* Ok: #{Diggit::Dig.it.journal.sources_by_state(:new).size}"
+				Log.error "* Error: #{Diggit::Dig.it.journal.sources_by_state(:new, true).size}"
+			end
+			Log.info "- Cloned sources:"
+			Log.indent do
+				Log.ok "* Ok: #{Diggit::Dig.it.journal.sources_by_state(:cloned).size}"
+				Log.error "* Error: #{Diggit::Dig.it.journal.sources_by_state(:cloned, true).size}"
+			end
 		end
 	end
-end
 
-desc 'Manage the sources of the diggit folder.'
-command :sources do |c|
-	c.desc 'List the sources.'
-	c.command :list do |list|
-		list.action do |_global_options, _options, _args|
-			sources = Diggit::Dig.it.journal.sources
-			sources.each_index do |idx|
-				msg = "#{idx}	#{sources[idx].url} (#{sources[idx].state})"
-				sources[idx].error? ? Log.error(msg) : Log.ok(msg)
+	desc 'Manage the sources of the diggit folder.'
+	command :sources do |c|
+		c.desc 'List the sources.'
+		c.command :list do |list|
+			list.action do |_global_options, _options, _args|
+				sources = Diggit::Dig.it.journal.sources
+				sources.each_index do |idx|
+					msg = "#{idx}	#{sources[idx].url} (#{sources[idx].state})"
+					sources[idx].error? ? Log.error(msg) : Log.ok(msg)
+				end
 			end
 		end
-	end
-	c.desc 'Add a source.'
-	c.arg_name 'url'
-	c.command :add do |add|
-		add.action do |_global_options, _options, args|
-			Diggit::Dig.it.journal.add_source args[0]
+		c.desc 'Add a source.'
+		c.arg_name 'url'
+		c.command :add do |add|
+			add.action do |_global_options, _options, args|
+				Diggit::Dig.it.journal.add_source args[0]
+			end
 		end
-	end
-	c.desc 'Import sources from a file.'
-	c.arg_name 'file'
-	c.command :import do |import|
-		import.action do |_global_options, _options, args|
-			File.open(args[0]).each { |line| Diggit::Dig.it.journal.add_source(line) }
+		c.desc 'Import sources from a file.'
+		c.arg_name 'file'
+		c.command :import do |import|
+			import.action do |_global_options, _options, args|
+				File.open(args[0]).each { |line| Diggit::Dig.it.journal.add_source(line) }
+			end
 		end
-	end
-	c.desc 'Display all sources in error.'
-	c.command :errors do |errors|
-		errors.action do |_global_options, _options, _args|
-			sources = Diggit::Dig.it.journal.sources
-			sources.each_index do |idx|
-				msg = "#{idx}	#{sources[idx].url} (#{sources[idx].state})"
-				Log.error msg if sources[idx].error?
+		c.desc 'Display all sources in error.'
+		c.command :errors do |errors|
+			errors.action do |_global_options, _options, _args|
+				sources = Diggit::Dig.it.journal.sources
+				sources.each_index do |idx|
+					msg = "#{idx}	#{sources[idx].url} (#{sources[idx].state})"
+					Log.error msg if sources[idx].error?
+				end
 			end
 		end
-	end
-	c.desc 'Display information on a source'
-	c.arg_name 'id'
-	c.command :info do |info|
-		info.action do |_global_options, _options, args|
-			src = Diggit::Dig.it.journal.sources_by_ids(args.to_i)
-			url = "URL: #{src.url}"
-			src.error? ? Log.error(url) : Log.info(url)
-			Log.info "State: #{src.state}"
-			Log.info "Performed analyses: #{src.performed_analyses.join(', ')}" unless src.performed_analyses.empty?
-			Log.error "Ongoing analyses: #{src.ongoing_analyses.join(', ')}" unless src.ongoing_analyses.emtpy?
-			if src.error?
-				error = src.error
-				Log.indent do
-					Log.error error[:message]
-					Log.info error[:backtrace].join("\n")
+		c.desc 'Display information on a source'
+		c.arg_name 'id'
+		c.command :info do |info|
+			info.action do |_global_options, _options, args|
+				src = Diggit::Dig.it.journal.sources_by_ids(args[0].to_i)[0]
+				url = "URL: #{src.url}"
+				src.error? ? Log.error(url) : Log.info(url)
+				Log.info "State: #{src.state}"
+				Log.info "Performed analyses: #{src.performed_analyses.join(', ')}" unless src.performed_analyses.empty?
+				Log.error "Ongoing analyses: #{src.ongoing_analyses.join(', ')}" unless src.ongoing_analyses.empty?
+				if src.error?
+					error = src.error
+					Log.indent do
+						Log.error error[:message]
+						Log.info error[:backtrace].join("\n")
+					end
 				end
 			end
 		end
+		c.default_command :list
 	end
-	c.default_command :list
-end
 
-desc 'Manage the joins of the diggit folder.'
-command :joins do |c|
-	c.desc 'List the joins'
-	c.command :list do |list|
-		list.action do |_global_options, _options, _args|
-			Diggit::Dig.it.config.get_joins.each { |a| Log.info a.name }
+	desc 'Manage the joins of the diggit folder.'
+	command :joins do |c|
+		c.desc 'List the joins'
+		c.command :list do |list|
+			list.action do |_global_options, _options, _args|
+				Diggit::Dig.it.config.get_joins.each { |a| Log.info a.name }
+			end
 		end
-	end
-	c.desc 'Add add join.'
-	c.arg_name 'name'
-	c.command :add do |add|
-		add.action do |_global_options, _options, args|
-			Diggit::Dig.it.config.add_join args[0]
+		c.desc 'Add a join.'
+		c.arg_name 'name'
+		c.command :add do |add|
+			add.action do |_global_options, _options, args|
+				Diggit::Dig.it.config.add_join args[0]
+			end
 		end
-	end
-	c.desc 'Perform joins.'
-	c.command :perform do |perform|
-		perform.flag [:s, :sources], desc: "list of sources", type: Array, default_value: []
-		perform.flag [:a, :analyses], desc: "list of analyses", type: Array, default_value: []
-		perform.flag [:m, :mode], desc: "running mode",
-				must_match: { "run" => :run, "clean" => :clean, "rerun" => :rerun }, default_value: :run
-		perform.action do |_global_options, options, _args|
-			Diggit::Dig.it.join(options[:s], options[:a], options[:m])
+		c.desc 'Delete a join.'
+		c.arg_name 'name'
+		c.command :del do |del|
+			del.action do |_global_options, _options, args|
+				Diggit::Dig.it.config.del_join args[0]
+			end
 		end
+		c.desc 'Perform joins.'
+		c.command :perform do |perform|
+			perform.flag [:s, :sources], desc: "list of sources", type: Array, default_value: []
+			perform.flag [:a, :analyses], desc: "list of analyses", type: Array, default_value: []
+			perform.flag [:m, :mode], desc: "running mode",
+			must_match: { "run" => :run, "clean" => :clean, "rerun" => :rerun }, default_value: :run
+			perform.action do |_global_options, options, _args|
+				Diggit::Dig.it.join(options[:s], options[:a], options[:m])
+			end
+		end
+		c.default_command :list
 	end
-	c.default_command :list
-end
 
-desc 'Manage the analyses of the diggit folder.'
-command :analyses do |c|
-	c.desc 'List the analyses'
-	c.command :list do |list|
-		list.action do |_global_options, _options, _args|
-			Diggit::Dig.it.config.get_analyses.each { |a| Log.info a.name }
+	desc 'Manage the analyses of the diggit folder.'
+	command :analyses do |c|
+		c.desc 'List the analyses'
+		c.command :list do |list|
+			list.action do |_global_options, _options, _args|
+				Diggit::Dig.it.config.get_analyses.each { |a| Log.info a.name }
+			end
 		end
-	end
-	c.desc 'Add an analysis.'
-	c.arg_name 'name'
-	c.command :add do |add|
-		add.action do |_global_options, _options, args|
-			Diggit::Dig.it.config.add_analysis args[0]
+		c.desc 'Add an analysis.'
+		c.arg_name 'name'
+		c.command :add do |add|
+			add.action do |_global_options, _options, args|
+				Diggit::Dig.it.config.add_analysis args[0]
+			end
 		end
-	end
-	c.desc 'Delete an analysis.'
-	c.arg_name 'name'
-	c.command :del do |add|
-		add.action do |_global_options, _options, args|
-			Diggit::Dig.it.config.del_analysis args[0]
+		c.desc 'Delete an analysis.'
+		c.arg_name 'name'
+		c.command :del do |del|
+			del.action do |_global_options, _options, args|
+				Diggit::Dig.it.config.del_analysis args[0]
+			end
 		end
-	end
-	c.desc 'Perform analyses.'
-	c.command :perform do |perform|
-		perform.flag [:s, :sources], desc: "list of sources", type: Array, default_value: []
-		perform.flag [:a, :analyses], desc: "list of analyses", type: Array, default_value: []
-		perform.flag [:m, :mode], desc: "running mode",
-				must_match: { "run" => :run, "clean" => :clean, "rerun" => :rerun }, default_value: :run
-		perform.action do |_global_options, options, _args|
-			Diggit::Dig.it.analyze(options[:s], options[:a], options[:m])
+		c.desc 'Perform analyses.'
+		c.command :perform do |perform|
+			perform.flag [:s, :sources], desc: "list of sources", type: Array, default_value: []
+			perform.flag [:a, :analyses], desc: "list of analyses", type: Array, default_value: []
+			perform.flag [:m, :mode], desc: "running mode",
+			must_match: { "run" => :run, "clean" => :clean, "rerun" => :rerun }, default_value: :run
+			perform.action do |_global_options, options, _args|
+				Diggit::Dig.it.analyze(options[:s], options[:a], options[:m])
+			end
 		end
+		c.default_command :list
 	end
-	c.default_command :list
-end
 
-desc 'Manage clone actions.'
-command :clone do |c|
-	c.desc 'Perform the clones.'
-	c.command :perform do |perform|
-		perform.flag [:s, :sources], desc: "list of sources", type: Array, default_value: []
-		perform.action do |_global_options, options, _args|
-			Diggit::Dig.it.clone(*options[:s])
+	desc 'Manage clone actions.'
+	command :clones do |c|
+		c.desc 'Perform the clones.'
+		c.command :perform do |perform|
+			perform.flag [:s, :sources], desc: "list of sources", type: Array, default_value: []
+			perform.action do |_global_options, options, _args|
+				Diggit::Dig.it.clone(*options[:s])
+			end
 		end
+		c.default_command :perform
+	end
+	pre do |globals, _command, _options, _args|
+		Diggit::Dig.init globals[:f]
+		Log.level = :fine if globals[:v]
+		true
 	end
-	c.default_command :perform
-end
 
-pre do |global, _command, _options, _args|
-	Diggit::Dig.init
-	Log.level = :fine if global[:v]
-	true
-end
+	post do |_global, _command, _options, _args|
+			# Post logic here, skips_post to skip commands
+	end
 
-post do |_global, _command, _options, _args|
-		# Post logic here, skips_post to skip commands
-end
+	on_error do |exception|
+		Log.error "Error running diggit."
+		Log.error exception.message
+		Log.info exception.backtrace.join("\n")
+		false
+	end
 
-on_error do |exception|
-	Log.error "Error running diggit."
-	Log.error exception.message
-	Log.info exception.backtrace.join("\n")
-	false
+	exit run(ARGV)
 end
-
-exit run(ARGV)

data/lib/dgit.rb

@@ -16,9 +16,8 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
-require_relative "dgit/core"
-require_relative "dgit/plugins"
-require_relative "dgit/version"
-require_relative "dgit/log"
+require_relative 'dgit/core'
+require_relative 'dgit/plugins'
+require_relative 'dgit/version'
+require_relative 'dgit/log'

data/lib/dgit/core.rb

@@ -16,7 +16,7 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
+# Copyright 2015 Matthieu Foucault <foucaultmatthieu@gmail.com>
 
 require 'oj'
 require 'rugged'
@@ -113,6 +113,11 @@ module Diggit
 			@entry[:ongoing_analyses]
 		end
 
+		def clean_analysis(analysis)
+			performed_analyses.delete_if { |e| e == analysis.name }
+			ongoing_analyses.delete_if { |e| e == analysis.name }
+		end
+
 		def clone
 			if File.exist?(folder)
 				Rugged::Repository.new(folder)
@@ -120,6 +125,7 @@ module Diggit
 				Rugged::Repository.clone_at(url, folder)
 			end
 			self.state = :cloned
+			self.error = nil
 		rescue => e
 			Log.error "Error cloning #{url}."
 			self.error = Journal.dump_error(e)
@@ -226,11 +232,11 @@ module Diggit
 		end
 
 		def to_hash
-			{ analyses: @analyses.map(&:name), joins: @joins.map(&:name) }
+			{ analyses: @analyses.map(&:simple_name), joins: @joins.map(&:simple_name) }
 		end
 
 		def add_analysis(name)
-			load_analysis(name) unless @analyses.map(&:name).include?(name)
+			load_analysis(name) unless @analyses.map(&:simple_name).include?(name)
 			Dig.it.save_config
 		end
 
@@ -239,17 +245,17 @@ module Diggit
 		end
 
 		def del_analysis(name)
-			@analyses.delete_if { |a| a.name == name }
+			@analyses.delete_if { |a| a.simple_name == name }
 			Dig.it.save_config
 		end
 
 		def get_analyses(*names)
 			return analyses if names.empty?
-			analyses.select { |a| names.include?(a.name) }
+			analyses.select { |a| names.include?(a.simple_name) }
 		end
 
 		def add_join(name)
-			load_join(name) unless @joins.map(&:name).include?(name)
+			load_join(name) unless @joins.map(&:simple_name).include?(name)
 			Dig.it.save_config
 		end
 
@@ -258,13 +264,13 @@ module Diggit
 		end
 
 		def del_join(name)
-			@joins.delete_if { |j| j.name == name }
+			@joins.delete_if { |j| j.simple_name == name }
 			Dig.it.save_config
 		end
 
 		def get_joins(*names)
 			return joins if names.empty?
-			joins.select { |j| joins.include?(j.name) }
+			joins.select { |j| joins.include?(j.simple_name) }
 		end
 
 		def self.empty_config
@@ -303,7 +309,7 @@ module Diggit
 		end
 
 		def self.plugin_paths(name, type, root)
-			Dir.glob(File.join(root, 'plugins', type.to_s, '**', "#{name}.rb"))
+			Dir.glob(File.join(root, 'plugins', type.to_s, '**{,/*/**}', "#{name}.rb"))
 		end
 
 		# Constructor. Should not be called directly. Use {.instance} instead.
@@ -386,7 +392,7 @@ module Diggit
 		end
 
 		# Initialize and return the diggit instance into the given folder.
-		# @param folder the path to the folder.
+		# @param folder [String] the path to the folder.
 		# @return [Dig] the instance.
 		def self.init(folder = '.')
 			@diggit = Dig.new(folder)
@@ -401,7 +407,7 @@ module Diggit
 		# It creates a +sources+ folder.
 		# It creates a +plugins+ folder.
 		# Directory creation is skipped if folder already exist.
-		# @param folder the path to the folder.
+		# @param folder [String] the path to the folder.
 		# @return [void]
 		def self.init_dir(folder = '.')
 			dgit_folder = File.expand_path(DGIT_FOLDER, folder)
@@ -541,7 +547,7 @@ module Diggit
 
 		def clean_analysis(s, a)
 			a.clean
-			s.del_analysis(a.name)
+			s.clean_analysis(a)
 		ensure
 			save_journal
 		end

data/lib/dgit/log.rb

@@ -16,7 +16,6 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 require 'formatador'
 
@@ -48,7 +47,7 @@ class Formatador
 	end
 
 	def self.visible(method)
-		target  = method.to_sym
+		target = method.to_sym
 		if target == :ok || target == :error || target == :info
 			true
 		elsif (target == :warn || target == :debug) && level == :fine

data/lib/dgit/plugins.rb

@@ -16,7 +16,6 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 require_relative 'core'
 
@@ -33,13 +32,27 @@ module Diggit
 			@options = options
 		end
 
+		# Returns the name of the plugin class
+		# @return [String]
 		def name
 			self.class.name
 		end
 
+		# Returns the name of the plugin class
+		# @return [String]
 		def self.name
 			to_s.underscore
 		end
+
+		# Returns the value of a plugin option
+		# @param ns [Symbol] the name of the option's namespace
+		# @param opt [Symbol] the name of the option
+		# @param default [Object] the default value
+		# @return [Object]
+		def read_option(ns, opt, default)
+			return @options[ns][opt] if @options.key?(ns) && @options[ns].key?(opt)
+			default
+		end
 	end
 
 	class Addon < Plugin
@@ -48,7 +61,9 @@ module Diggit
 		end
 	end
 
-	# Base class for analyses and joins. Runnables can be runned or cleaned.
+	# Base class for analyses and joins.
+	# Runnables can be runned or cleaned.
+	# A clean of a runnable should always work, even if it has never been run.
 	# These methods have to be implemented in the subclasses.
 	# Addons can be made available to a runnable through a call to {.require\_addons}.
 	# Addons can be accessed through the addons attribute, and they contain
@@ -81,7 +96,7 @@ module Diggit
 
 		# Add an addon as a required addon.
 		#
-		# @param names Array<String> the names of addons to require.
+		# @param names [Array<String>] the names of addons to require.
 		# 	They correspond to the name of their class with underscore case.
 		# @return [void]
 		def self.require_addons(*names)
@@ -89,8 +104,9 @@ module Diggit
 		end
 
 		def self.required_addons
-			return [] if @required_addons.nil?
-			@required_addons
+			base_addons = superclass < Runnable ? superclass.required_addons : []
+			return base_addons if @required_addons.nil?
+			base_addons + @required_addons
 		end
 	end
 
@@ -128,7 +144,7 @@ module Diggit
 
 		# Add an analysis as a required analysis.
 		#
-		# @param names Array<String> the names of analyses to require.
+		# @param names [Array<String>] the names of analyses to require.
 		# 	They correspond to the name of their class with underscore case.
 		# @return [void]
 		def self.require_analyses(*names)
@@ -169,5 +185,12 @@ module Diggit
 			super(options)
 			@source = nil
 		end
+
+		# Returns the rugged repository associated to the source.
+		#
+		# @return [Rugged::Repository]
+		def repo
+			@source.repository
+		end
 	end
 end

data/lib/dgit/version.rb

@@ -16,8 +16,7 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 module Diggit
-	VERSION = "2.0.1"
+	VERSION = "2.0.2"
 end

data/plugins/addon/db.rb

@@ -16,7 +16,6 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 require 'mongo'
 
@@ -26,14 +25,20 @@ require 'mongo'
 # @!attribute [r] db
 # 	@return [Mongo::DB] the mongo database object.
 class Db < Diggit::Addon
-	DEFAULT_URL = 'mongodb://127.0.0.1:27017/diggit'
+	DEFAULT_SERVER = '127.0.0.1:27017'
+	DEFAULT_DB = 'diggit'
 
 	attr_reader :client
 
 	def initialize(*args)
 		super
-		url = DEFAULT_URL
-		url = @options[:mongo][:url] if @options.key?(:mongo) && @options[:mongo].key?(:url)
-		@client = Mongo::Client.new(url)
+		Mongo::Logger.logger.level = ::Logger::FATAL
+		server = read_option(:mongo, :server, DEFAULT_SERVER)
+		db = read_option(:mongo, :db, DEFAULT_DB)
+		@client = Mongo::Client.new([server], database: db)
+	end
+
+	def insert(collection, data)
+		client[collection].bulk_write(data.map { |d| { insert_one: d } }, ordered: true) unless data.empty?
 	end
 end

data/plugins/addon/out.rb

@@ -16,7 +16,6 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 # A output addon for Diggit. The name of the addon is :output, and can be reached in the
 # addons hash. This addon might use an :output hash in the global options. In this hash, the

data/plugins/addon/r.rb

@@ -17,7 +17,6 @@
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
 # Copyright 2015 Matthieu Foucault <foucaultmatthieu@gmail.com>
-#
 
 R = nil # fixing SIGPIPE error in some cases. See http://hfeild-software.blogspot.fr/2013/01/rinruby-woes.html
 

data/plugins/addon/src_opt.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+#
+# This file is part of Diggit.
+#
+# Diggit is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Diggit is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
+# Copyright 2015 Matthieu Foucault <foucaultmatthieu@gmail.com>
+
+# Manages options that are specific to a given source
+class SrcOpt < Diggit::Addon
+	SOURCES_OPTIONS_FILE = 'sources_options'
+
+	def initialize(*args)
+		super
+		sources_options_path = Diggit::Dig.it.config_path(SOURCES_OPTIONS_FILE)
+		@sources_options = {}
+		@sources_options = Oj.load_file(sources_options_path) if File.exist? sources_options_path
+	end
+
+	def [](source)
+		@sources_options[source.url]
+	end
+end

data/plugins/analysis/cloc.rb

@@ -16,7 +16,6 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 require 'yaml'
 
@@ -28,15 +27,22 @@ class Cloc < Diggit::Analysis
 	end
 
 	def run
-		cloc = `cloc . --progress-rate=0 --quiet --yaml`
-		return if cloc.empty?
-		yaml = YAML.load(cloc.lines[2..-1].join)
-		yaml.delete('header')
-		output = { source: @source.url, cloc: yaml }
-		db.client['cloc'].insert_one(output)
+		walker = Rugged::Walker.new(repo)
+		walker.sorting(Rugged::SORT_TOPO | Rugged::SORT_REVERSE)
+		walker.push(repo.head.name)
+		walker.each do |c|
+			repo.checkout(c.oid, { strategy: [:force, :remove_untracked] })
+			cloc = `cloc #{@source.folder} --progress-rate=0 --quiet --yaml`
+			next if cloc.empty?
+			yaml = YAML.load(cloc.lines[2..-1].join)
+			yaml.delete('header')
+			output = { source: @source.url, commit: c.oid, cloc: yaml }
+			db.client['cloc'].insert_one(output)
+		end
 	end
 
 	def clean
-		db.client['cloc'].find({ source: @source.url }).delete_one
+		db.client['cloc'].find({ source: @source.url }).delete_many
+		repo.checkout('master')
 	end
 end

data/plugins/analysis/cloc_per_file.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+#
+# This file is part of Diggit.
+#
+# Diggit is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Diggit is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
+# Copyright 2015 Matthieu Foucault <foucaultmatthieu@gmail.com>
+
+class ClocPerFile < Diggit::Analysis
+	require_addons 'db', 'src_opt'
+
+	def run
+		commit_oid = src_opt[@source]["cloc-commit-id"] unless src_opt[@source].nil?
+		commit_oid = 'HEAD' if commit_oid.nil?
+		repo.checkout(commit_oid, { strategy: [:force, :remove_untracked] })
+		folder = File.expand_path(@source.folder)
+		cloc = `cloc #{folder} --progress-rate=0 --quiet --by-file --yaml --script-lang=Python,python`
+		return if cloc.empty?
+		yaml = YAML.load(cloc.lines[2..-1].join)
+		yaml.delete('header')
+		yaml.delete('SUM')
+		cloc_a = []
+		yaml.each do |key, value|
+			# transform the hash so the filenames are not keys anymore (as they may contain a '.' it is incompatible with mongo)
+			path = File.expand_path(key).gsub(folder, '').gsub(%r{^/}, '')
+			cloc_a << value.merge({ path: path })
+		end
+		output = { source: @source.url, commit_oid: commit_oid.to_s, cloc: cloc_a }
+		col = db.client['cloc-file']
+		col.insert_one(output)
+	end
+
+	def clean
+		db.client['cloc-file'].find({ source: @source.url }).delete_one
+	end
+end

data/plugins/analysis/tex.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+#
+# This file is part of Diggit.
+#
+# Diggit is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Diggit is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
+
+require 'fileutils'
+
+class Tex < Diggit::Analysis
+	require_addons 'out'
+
+	def initialize(options)
+		super(options)
+	end
+
+	def run
+		walker = Rugged::Walker.new(repo)
+		walker.sorting(Rugged::SORT_TOPO | Rugged::SORT_REVERSE)
+		walker.push(repo.head.name)
+		walker.each do |c|
+			repo.checkout(c.oid, { strategy: [:force, :remove_untracked] })
+			words = Dir["**/*.tex"].reduce(0) { |a, e| a + `cat "#{e}" | wc -w`.to_i }
+			File.open(file, 'a') { |f| f.puts("#{source.url};#{c.oid};#{words}\n") }
+		end
+	end
+
+	def clean
+		FileUtils.rm_rf(file)
+		repo.checkout("master")
+	end
+
+	def file
+		"#{out.out}/words.csv"
+	end
+end

data/spec/core_spec.rb

@@ -16,7 +16,6 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 require 'spec_helper'
 require 'fileutils'
@@ -110,9 +109,10 @@ RSpec.describe Diggit::Dig do
 
 	it "should perform analyses in order" do
 		Diggit::Dig.it.config.add_analysis("test_analysis")
+		expect_any_instance_of(TestAnalysis).to receive(:run)
 		Diggit::Dig.it.config.add_analysis("test_analysis_with_addon")
+		expect_any_instance_of(TestAnalysisWithAddon).to receive(:run)
 		Diggit::Dig.it.analyze
-		# expect(TestAnalysis.state).to eq("runned")
 		expect(Diggit::Dig.it.journal.sources_by_ids(0)[0].all_analyses).to eq(%w(test_analysis test_analysis_with_addon))
 		Diggit::Dig.init("spec/dgit")
 		expect(Diggit::Dig.it.journal.sources_by_ids(0)[0].all_analyses).to eq(%w(test_analysis test_analysis_with_addon))
@@ -130,10 +130,38 @@ RSpec.describe Diggit::Dig do
 	it "should perform joins" do
 		Diggit::Dig.it.config.add_join("test_join")
 		Diggit::Dig.it.config.add_join("test_join_with_addon")
+		expect_any_instance_of(TestJoin).to receive(:run)
+		expect_any_instance_of(TestJoinWithAddon).not_to receive(:run)
 		Diggit::Dig.it.join
 		expect(Diggit::Dig.it.journal.join?("test_join")).to be true
-		expect(TestJoin.sources.size).to eq 1
-		expect(TestJoin.sources[0].url).to eq TEST_URL
 		expect(Diggit::Dig.it.journal.join?("test_join_with_addon")).to be false
 	end
+
+	it "should clean joins" do
+		expect_any_instance_of(TestJoin).to receive(:clean)
+		expect_any_instance_of(TestJoinWithAddon).to receive(:clean)
+		Diggit::Dig.it.join([], [], :clean)
+	end
+
+	it "should clean analyses" do
+		expect_any_instance_of(TestAnalysis).to receive(:clean)
+		expect_any_instance_of(TestAnalysisWithAddon).to receive(:clean)
+		Diggit::Dig.it.analyze([], [], :clean)
+		expect(Diggit::Dig.it.journal.sources_by_ids(0)[0].all_analyses).to eq([])
+	end
+
+	it "should read source options" do
+		File.open("spec/dgit/.dgit/sources_options", "w") do |f|
+			f.write('{
+								"https://github.com/jrfaller/test-git.git":{
+									"myOption":"myValue"
+								}
+							}')
+		end
+
+		Diggit::Dig.it.config.add_analysis("test_analysis_with_sources_options")
+		expect { Diggit::Dig.it.analyze }.to output(/myValue/).to_stdout
+		Diggit::Dig.it.analyze([], [], :clean)
+		Diggit::Dig.it.config.del_analysis("test_analysis_with_sources_options")
+	end
 end

data/spec/dgit/plugins/addon/test_addon.rb

@@ -16,7 +16,6 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 class TestAddon < Diggit::Addon
 	def foo

data/spec/dgit/plugins/analysis/duplicate_analysis.rb

@@ -17,7 +17,6 @@
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
 # Copyright 2015 Matthieu Foucault <foucaultmatthieu@gmail.com>
-#
 
 class DuplicateAnalysis < Diggit::Analysis
 	def run

data/spec/dgit/plugins/analysis/my_module/duplicate_analysis.rb

@@ -17,7 +17,6 @@
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
 # Copyright 2015 Matthieu Foucault <foucaultmatthieu@gmail.com>
-#
 
 module MyModule
 	class DuplicateAnalysis < Diggit::Analysis

data/spec/dgit/plugins/analysis/my_module/other_analysis.rb

@@ -17,7 +17,6 @@
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
 # Copyright 2015 Matthieu Foucault <foucaultmatthieu@gmail.com>
-#
 
 module MyModule
 	class OtherAnalysis < Diggit::Analysis

data/spec/dgit/plugins/analysis/test_analysis.rb

@@ -16,7 +16,6 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 class TestAnalysis < Diggit::Analysis
 	def run

data/spec/dgit/plugins/analysis/test_analysis_with_addon.rb

@@ -16,7 +16,6 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 class TestAnalysisWithAddon < Diggit::Analysis
 	require_addons "test_addon"

data/spec/dgit/plugins/analysis/test_analysis_with_error.rb

@@ -16,7 +16,6 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 class TestAnalysisWithError < Diggit::Analysis
 	def run

data/spec/dgit/plugins/analysis/test_analysis_with_sources_options.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+#
+# This file is part of Diggit.
+#
+# Diggit is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Diggit is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
+#
+
+class TestAnalysisWithSourcesOptions < Diggit::Analysis
+	require_addons "src_opt"
+
+	def initialize(*args)
+		super(args)
+	end
+
+	def run
+		p(src_opt[@source]["myOption"])
+	end
+
+	def clean
+	end
+end

data/spec/dgit/plugins/join/test_join.rb

@@ -16,18 +16,13 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 class TestJoin < Diggit::Join
 	require_analyses 'test_analysis'
 
-	class << self
-		attr_accessor :sources
+	def run
 	end
 
-	@sources = nil
-
-	def run
-		self.class.sources = @sources
+	def clean
 	end
 end

data/spec/dgit/plugins/join/test_join_with_addon.rb

@@ -16,9 +16,14 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
 
 class TestJoinWithAddon < Diggit::Join
 	require_addons 'test_addon'
 	require_analyses 'test_analysis_with_error'
+
+	def run
+	end
+
+	def clean
+	end
 end

data/spec/spec_helper.rb

@@ -16,7 +16,7 @@
 # along with Diggit.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2015 Jean-Rémy Falleri <jr.falleri@gmail.com>
-#
+
 require 'coveralls'
 Coveralls.wear!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diggit
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jean-Rémy Falleri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -173,7 +173,10 @@ files:
 - plugins/addon/db.rb
 - plugins/addon/out.rb
 - plugins/addon/r.rb
+- plugins/addon/src_opt.rb
 - plugins/analysis/cloc.rb
+- plugins/analysis/cloc_per_file.rb
+- plugins/analysis/tex.rb
 - spec/core_spec.rb
 - spec/dgit/plugins/addon/test_addon.rb
 - spec/dgit/plugins/analysis/duplicate_analysis.rb
@@ -182,6 +185,7 @@ files:
 - spec/dgit/plugins/analysis/test_analysis.rb
 - spec/dgit/plugins/analysis/test_analysis_with_addon.rb
 - spec/dgit/plugins/analysis/test_analysis_with_error.rb
+- spec/dgit/plugins/analysis/test_analysis_with_sources_options.rb
 - spec/dgit/plugins/join/test_join.rb
 - spec/dgit/plugins/join/test_join_with_addon.rb
 - spec/spec_helper.rb
@@ -205,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Git repository analysis tool.