norminette 1.0.0.rc1.pre.0 → 1.0.0.rc2.pre.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d367fb0aefd758e19a5b1f1fb73f8575c5c8a4
-  data.tar.gz: d087f039fe301c03bcd21f66172d4e3e6a3b1242
+  metadata.gz: 1333bc4fa361ac722efa09d9a9c7549436ecc113
+  data.tar.gz: 9a0e3cfd461b3345e785cdd2ee86af26b094eafd
 SHA512:
-  metadata.gz: 0bc69ce67ee61586fe35acb1f9a1e27fbae5ad2f20846272f98cb7f005159f88d16d1fd3ee86512ef57c0e45c550a7c275e6755be0b97eaec13e466fe1b97b1a
-  data.tar.gz: 304e8bc6049e2aad4dfb76a590b0a048a97d283e2973526e86ac541492ae169c1ee482623ed0ad8d003db72f5a69ba4127cdee40034ddbdc1c867d3485285583
+  metadata.gz: daff01e41d247f8db7302fa37f89acda7dbaa5eca30fce84fedb0b558e97ef733f042b7123d8a9a6d754b5e425a433514f539107cd9903a9313164740167b9db
+  data.tar.gz: a5216396fc9acee103c7671fab2ef237200b41bc2f6591685dfb3c2efba26c322632393f2c113e0b9ade08fdd23d95a001d90f345f21d639646bdde788b3800d

data/bin/norminette

@@ -5,14 +5,6 @@ require 'optparse'
 
 $current_path = Dir.pwd
 
-if File.symlink?(__FILE__)
-	    dir = File.expand_path(File.dirname(File.expand_path(__FILE__)) + "/" + File.dirname(File.readlink(__FILE__)))
-		    Dir.chdir dir
-else
-	    dir = File.expand_path(File.dirname(__FILE__))
-		    Dir.chdir dir
-end
-
 Bundler.require
 require 'bunny'
 require 'facter'
@@ -24,7 +16,7 @@ class Sender
 							vhost: 		"/",
 							user: 		"guest",
 							password: 	"guest"
-		
+
 		@conn.start
 		@ch 			= @conn.create_channel
 		@x  			= @ch.default_exchange
@@ -37,10 +29,10 @@ class Sender
 		@reply_queue.subscribe do |delivery_info, properties, payload|
 			@counter -= 1
 			block.call delivery_info, properties, payload
-	    	@lock.synchronize { @condition.signal }
-	  	end
+			@lock.synchronize { @condition.signal }
+		end
 
-	  	at_exit { desinitialize }
+		at_exit { desinitialize }
 	end
 
 	def desinitialize
@@ -50,8 +42,9 @@ class Sender
 
 	def publish content
 		@counter += 1
-		@x.publish content,	routing_key:  @routing_key,
-							reply_to:     @reply_queue.name
+		@x.publish content,	routing_key:	@routing_key,
+							reply_to:		@reply_queue.name,
+							correlation_id:	SecureRandom.uuid
 	end
 
 	def sync_if_needed max = Facter.value('processors')['count']
@@ -68,8 +61,8 @@ end
 class Norminette
 	def initialize
 		@files			= []
-		@sender 		= Sender.new do |delivery_info, properties, payload|
-	    	manage_result JSON.parse(payload)
+		@sender			= Sender.new do |delivery_info, properties, payload|
+			manage_result JSON.parse(payload)
 		end
 	end
 
@@ -99,7 +92,7 @@ class Norminette
 	end
 
 	def version
-		puts "Local version:\n1.0.0.rc1"
+		puts "Local version:\n1.0.0.rc2"
 		puts "Norminette version:"
 		send_content({action: "version"}.to_json)
 	end
@@ -113,7 +106,6 @@ class Norminette
 	end
 
 	def populate_file file
-		file = (Pathname.new(file).absolute? ? file : File.join($current_path, file))
 		unless is_a_valid_file? file
 			manage_result 'filename' => file, 'display' => "Warning: Not a valid file"
 			return
@@ -137,44 +129,47 @@ class Norminette
 		@sender.publish content
 	end
 
-	def manage_result result		
-		puts "Norme: #{result['filename']}" 	if result['filename']
-		puts result['display']	 				if result['display']
-		exit 0 									if result['stop'] == true
+	def cleanify_path filename
+		File.expand_path(filename).gsub(/^#$current_path\/?/, "./")
+	end
+
+	def manage_result result
+		puts "Norme: #{cleanify_path(result['filename'])}"	if result['filename']
+		puts result['display']								if result['display']
+		exit 0												if result['stop'] == true
 	end
 end
 
 class Parser
-  def self.parse(options)
-  	args 	= OpenStruct.new
-    opt_parser = OptionParser.new do |opts|
-      opts.banner = "Usage: #$0 [options] [files_or_directories]"
-
-      opts.on("-v", "--version", "Print version") do |n|
-      	args.version = true
-      end
-
-      opts.on("-R", "--rules Array", Array, "Rule to disable") do |rules|
-      	args.rules = rules
-      end
-
-      opts.on("-h", "--help", "Prints this help") do
-  		sender 	= Sender.new do |delivery_info, properties, payload|
-  			puts JSON.parse(payload)['display']
-		end
+	def self.parse(options)
+		args = OpenStruct.new
+		opt_parser = OptionParser.new do |opts|
+			opts.banner = "Usage: #$0 [options] [files_or_directories]"
 
-        puts opts
-        puts "Norminette usage:"
-        sender.publish({action: "help"}.to_json)
-        sender.sync
-        exit
-      end
-    end
+			opts.on("-v", "--version", "Print version") do |n|
+				args.version = true
+			end
+
+			opts.on("-R", "--rules Array", Array, "Rule to disable") do |rules|
+				args.rules = rules
+			end
 
-    opt_parser.parse!(options) rescue abort $!.to_s
+			opts.on("-h", "--help", "Prints this help") do
+				sender = Sender.new do |delivery_info, properties, payload|
+					puts JSON.parse(payload)['display']
+				end
 
-    return args
-  end
+				puts opts
+				puts "Norminette usage:"
+				sender.publish({action: "help"}.to_json)
+				sender.sync
+				exit
+			end
+		end
+		opt_parser.parse!(options) rescue abort $!.to_s
+
+		return args
+	end
 end
 
 Norminette.new.check ARGV, Parser.parse(ARGV)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norminette
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1.pre.0
+  version: 1.0.0.rc2.pre.0
 platform: ruby
 authors:
 - Bocal 42
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny