pug 0.2.1 → 0.2.2

data/bin/pug.rb

@@ -1,9 +1,7 @@
 #!/usr/bin/env ruby
 require "pug"
 require "tracker"
-require "configuration"
 require "commands/commandcontext"
-require "commands/initcommand"
 require "commands/addcommand"
 require "commands/helpcommand"
 require "commands/diffcommand"
@@ -24,25 +22,20 @@ onexit = lambda do |x|
 end
 
 commandcontext = Commands::CommandContext.new(ARGV, onerror, onoutput, onprompt, onexit)
-commandname = commandcontext.pop_argument!("Missing command, try help ;-)")
+commandname = commandcontext.pop_command!("Missing command, try help ;-)")
 
-configuration = Configuration.new('.')
-
-# make sure that we are configured
-if commandname == 'init' || !configuration.has_globalconfiguration?
-	puts "There is no configuration available, please provide me with some info..." if commandname != "init"
-	Commands::InitCommand.new(configuration).run commandcontext
-	exit 0 if commandname == 'init'
+if commandname == 'help'
+	command = Meta::command_from_name('help', nil)
+	command.run commandcontext 
+	exit(0)
 end
 
-if commandname == nil
-	commandname = 'help'
+if commandcontext.options.has_key?'pugs'
+	pugspath = commandcontext.options['pugs']
+else
+	pugspath = File.join('.', 'pugs')
 end
 
-globalconfiguration = configuration.get_globalconfiguration()
-
-# path to directory should be read from .pug_global
-pugspath = globalconfiguration.pugspath
 tracker = Tracker.new(pugspath)
 
 command = Meta::command_from_name(commandname, tracker)

data/lib/commands/addcommand.rb

@@ -10,8 +10,8 @@ module Commands
 		end
 
 		def run(commandcontext)
-			type = commandcontext.pop_argument! 'Missing type'
-			status = commandcontext.pop_argument! 'Missing status'
+			type = commandcontext.pop_command! 'Missing type'
+			status = commandcontext.pop_command! 'Missing status'
 
 			title = commandcontext.prompt "Enter a title"
 

data/lib/commands/commandcontext.rb

@@ -4,28 +4,32 @@ require "commands/headlesscommandcontext"
 
 module Commands
 	class CommandContext
-		attr_accessor :output_lambda, :prompt_lambda, :now_lambda
+		attr_accessor :options, :commands
 
 		def initialize(arguments, onerror, onoutput, onprompt, onexit)
-			@arguments = arguments
-			@headless = (@arguments.any? { |arg| arg == '--headless' })
+			@commands = arguments.select { |a| !a.start_with?'-' }
+			@options = Hash[arguments
+				.select { |a| a.start_with?'-' }
+				.map {|o| 
+					parsed = Parse::option_to_name_and_value(o) 
+					[parsed[:name], parsed[:value]]
+				}]
 			@onerror = onerror
 			@onexit = onexit
 			@onoutput = onoutput
 			@onprompt = onprompt
-			@now_lambda = lambda {|| DateTime.now }
 		end
 
-		def pop_argument!(text_when_missing = nil)
-			if number_of_arguments == 0
+		def pop_command!(text_when_missing = nil)
+			if @commands.length == 0
 				@onerror.call(text_when_missing)
 				@onexit.call(1)
 			end
-			@arguments.shift
+			@commands.shift
 		end
 
-		def number_of_arguments
-			@arguments.length
+		def number_of_commands
+			@commands.length
 		end
 
 		def output(s)
@@ -48,7 +52,7 @@ module Commands
 		#end
 
 		def get_now
-			@now_lambda.call
+			DateTime.now
 		end
 
 

data/lib/commands/diffcommand.rb

@@ -11,8 +11,8 @@ module Commands
 		end
 
 		def run(commandcontext)
-			type = commandcontext.pop_argument! 'Missing type'
-			pugspath_was = commandcontext.pop_argument! 'Missing path to pugs'
+			type = commandcontext.pop_command! 'Missing type'
+			pugspath_was = commandcontext.pop_command! 'Missing path to pugs'
 			tracker_was = Tracker.new(pugspath_was)
 			DeltaTracker.new().get(type, @tracker_is, tracker_was){|d| commandcontext.output(d) }
 		end

data/lib/commands/helpcommand.rb

@@ -9,10 +9,10 @@ module Commands
 		end
 
 		def run(commandcontext)
-			if commandcontext.number_of_arguments == 0
+			if commandcontext.number_of_commands == 0
 				help(commandcontext)
 			else
-				commandname = commandcontext.pop_argument!("")
+				commandname = commandcontext.pop_command!("")
 				command = Meta::command_from_name(commandname, @tracker)
 				if command != nil
 					command.help(commandcontext)

data/lib/commands/listcommand.rb

@@ -11,8 +11,8 @@ module Commands
 		end
 
 		def run(commandcontext)
-			type = commandcontext.pop_argument!.downcase if commandcontext.number_of_arguments > 0
-			status = commandcontext.pop_argument!.downcase if commandcontext.number_of_arguments > 0
+			type = commandcontext.options['type']
+			status =  commandcontext.options['status']
 
 			@tracker.all {|x|
 				if (x.type.downcase == type || type == nil) && (x.status.downcase == status || status == nil)

data/lib/pugversion.rb

@@ -1,3 +1,3 @@
 module Pug
-	VERSION = '0.2.1'
+	VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pug
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000Z
+date: 2013-03-06 00:00:00.000000000Z
 dependencies: []
 description: Pug is a simple light-weight distributed issue tracker, main purpose
   is to automatically create release reports.
@@ -26,9 +26,7 @@ files:
 - lib/commands/diffcommand.rb
 - lib/commands/headlesscommandcontext.rb
 - lib/commands/helpcommand.rb
-- lib/commands/initcommand.rb
 - lib/commands/listcommand.rb
-- lib/configuration.rb
 - lib/deltatracker.rb
 - lib/format.rb
 - lib/meta.rb
@@ -58,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 146984957
+      hash: 764089841
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.7.2

data/lib/commands/initcommand.rb

@@ -1,22 +0,0 @@
-$:.unshift(File.expand_path('../../', __FILE__))
-
-require "configuration"
-
-module Commands
-	class InitCommand
-		def initialize(configuration)
-			@configuration = configuration
-		end
-
-		def run(commandcontext)
-			globalconfiguration = GlobalConfiguration.new
-			globalconfiguration.pugspath = commandcontext.prompt "Enter full path to where pugs will be placed"
-			@configuration.set_globalconfiguration(globalconfiguration)
-		end
-
-			def help(commandcontext)
-			commandcontext.output 'Use pug init'
-			commandcontext.output 'Configures settings file'
-		end	
-	end
-end

data/lib/configuration.rb

@@ -1,47 +0,0 @@
-require "yaml"
-
-class GlobalConfiguration
-	attr_accessor :pugspath
-
-	def initialize
-		@pugspath = ''
-	end
-end
-
-class Configuration
-	def initialize(path)
-		@path = path
-	end
-
-	def _globalconfiguration_filename()
-		File.join(@path, '.pug_global')
-	end
-
-	def has_globalconfiguration?
-		File.exists?(_globalconfiguration_filename)
-	end
-
-	def set_globalconfiguration(model)
-		content = model.to_yaml
-		begin
-			file = File.new(_globalconfiguration_filename, 'w')
-			file.write(content)
-		ensure
-			file.close
-		end
-
-		if !Dir.exists?(model.pugspath)
-			Dir.mkdir(model.pugspath)
-		end
-	end
-
-	def get_globalconfiguration()
-		begin
-			file = File.open(_globalconfiguration_filename)
-			model = YAML::load(file) if file != nil
-			model
-		ensure
-			file.close if file != nil
-		end
-	end
-end