logirel 0.0.8 → 0.0.14

data/.semver

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 8
+:patch: 14
 :special: ""

data/Rakefile.rb

@@ -11,27 +11,35 @@ RSpec::Core::RakeTask.new(:spec)
 #gem install'd it) and release will push the gem to Rubygems for 
 #consumption by the public.
 
-desc 'Tag the repository in git with gem version number'
-task :tag do
+task :verify do
   changed_files = `git diff --cached --name-only`.split("\n") + `git diff --name-only`.split("\n")
+  if !(changed_files == ['Rakefile.rb'] or changed_files.empty?)
+    raise "Repository contains uncommitted changes; either commit or stash."
+  end
+end
+
+desc 'Tag the repository in git with gem version number'
+task :tag => :verify do
   v = SemVer.find
-  if changed_files == ['Rakefile.rb'] or changed_files.empty?
-    Rake::Task["build"].invoke
+  Rake::Task["build"].invoke
   
-    if `git tag`.split("\n").include?("#{v.to_s}")
-      raise "Version #{v.to_s} has already been released"
-    end
-	puts 'adding'
-    `git add #{File.expand_path("logirel.gemspec", __FILE__)}`
-    puts 'committing'
-	`git commit -m "Released version #{v.to_s}"`
-	puts 'tagging'
-	`git tag #{v.to_s}`
-	puts 'pushing tags'
-    `git push --tags`
-	puts 'pushing'
-    `git push`
-  else
-    raise "Repository contains uncommitted changes; either commit or stash."
+  if `git tag`.split("\n").include?("#{v.to_s}")
+    raise "Version #{v.to_s} has already been released"
   end
+  puts 'adding'
+  `git add Rakefile.rb`
+  puts 'committing'
+  `git commit -m "Released version #{v.to_s}"`
+  puts 'tagging'
+  `git tag #{v.to_s}`
+  puts 'locally installing'
+  Rake::Task["install"].invoke
+end
+
+desc "push data and tags"
+task :push => :verify do
+  puts 'pushing tags'
+  `git push --tags`
+  puts 'pushing'
+  `git push`
 end

data/lib/logirel/Initer.rb

@@ -4,33 +4,34 @@ require 'net/http'
 
 module Logirel
   class Initer
-	
-	attr_accessor :root_path, :buildscripts_path
-	
-	def initialize(root = '.', buildscripts = 'buildscripts'); 
-	                @root_path = root
-					@buildscripts_path = buildscripts; end
-	def set_root(root); @root_path = root; end
-  
+    
+    attr_accessor :root_path, :buildscripts_path
+    
+    def initialize(root = '.', buildscripts = 'buildscripts'); 
+      @root_path = root
+      @buildscripts_path = buildscripts
+    end
+    def set_root(root); @root_path = root; end
+    
     def get_commands
-	  cmd ||= []
-	  cmd << "semver init"
-	end
-	
-	def nuget_from_codeplex(cp_ver, gem_ver)
-	  (cp_ver <=> gem_ver) > 0
-	end
-	
-	def create_structure
-	  # puts "making dir #{@root_path}"
-	  ['buildscripts', 'src'].each do |d|
-	    path = File.join(@root_path, d)
-	    Dir.mkdir path unless Dir.exists? path
-	  end
-	end
-	
-	def create_path_folders(metas, f)
-	  	f.puts %q{
+      cmd ||= []
+      cmd << "semver init"
+    end
+    
+    def nuget_from_codeplex(cp_ver, gem_ver)
+      (cp_ver <=> gem_ver) > 0
+    end
+    
+    def create_structure
+      # puts "making dir #{@root_path}"
+      ['buildscripts', 'src'].each do |d|
+        path = File.join(@root_path, d)
+        Dir.mkdir path unless Dir.exists? path
+      end
+    end
+    
+    def create_path_folders(metas, f)
+      	f.puts %q{
 require File.dirname(__FILE__) + '/project_data'
 root_folder = File.expand_path("#{File.dirname(__FILE__)}/..")
 Folders = \{
@@ -90,7 +91,8 @@ Folders = \{
 	end
 	
 	def init_environement_rb
-	  path = File.join(@root_path, @buildscripts_path, "environment.rb")
+	  base_path = ensure_path @buildscripts_path
+	  path = File.join base_path, "environment.rb"
 	  File.open(path, "w") do |f|
 	    f.puts Net::HTTP.get(
 		  URI.parse('https://raw.github.com/haf/logirel/master/content/environment.rb'))
@@ -109,7 +111,7 @@ Folders = \{
 	end
 	
 	def init_gemfile
-	  File.open(File.join(@root_path, "Gemfile"), "w") do |f|
+	  File.open(File.join(@root_path, "Gemfile"), "w+") do |f|
         f.puts 'source "http://rubygems.org"'
         f.puts 'gem "albacore"'
 		f.puts 'gem "semver"'
@@ -118,7 +120,8 @@ Folders = \{
 	end
 	
 	def init_utils
-	  path = File.join(@root_path, @buildscripts_path, "utils.rb")
+	  base_path = ensure_path @buildscripts_path
+	  path = File.join base_path, "utils.rb"
 	  File.open(path, "w") do |f|
 	    f.puts Net::HTTP.get(
 		  URI.parse('https://raw.github.com/haf/logirel/master/content/utils.rb'))
@@ -138,8 +141,8 @@ Folders = \{
 	end
 	
 	def init_rakefile(metas)
-	  # puts metas.map{|m| ":build_"+m.ruby_key}
-      File.open(File.join(@root_path, @buildscripts_path, "Rakefile.rb"), "w") do |f|
+	  base_path = ensure_path @buildscripts_path
+      File.open File.join(base_path, "Rakefile.rb"), "w" do |f|
 	    f.puts %q{
 require 'rubygems'
 require 'bundler'
@@ -163,20 +166,27 @@ task :ci => ["env:release", :build, :package]
 	  end
 	end
 	
-	def init_project_details(metadata)
-      File.open(File.join(@root_path, @buildscripts_path, "project_details.rb"), "w") do |f|
-	    f.puts "Projects = {"
-		# m = ["my key", value]
-		# projects[m[0]] = value
-	    metadata.keys.each_with_index do |key, index|
-		  if index == metadata.length-1
-            f.puts ":#{key} = #{p(metadata[key])}"
-		  else 
-		    f.puts ":#{key} = #{p(metadata[key])},"
-		  end
+    def init_project_details(metadata)
+	  base_path = ensure_path @buildscripts_path
+      File.open(File.join(base_path, "project_details.rb"), "w+") do |f|
+        f.puts "Projects = {"
+        # m = ["my key", value]
+        # projects[m[0]] = value
+        metadata.keys.each_with_index do |key, index|
+          if index == metadata.length-1
+              f.puts ":#{key} = #{p(metadata[key])}"
+          else 
+            f.puts ":#{key} = #{p(metadata[key])},"
+          end
         end
-		f.puts "}"
+        f.puts "}"
       end
+    end
+	
+	def ensure_path path
+      base_path = File.join @root_path, path
+      Dir.mkdir base_path unless Dir.exists? base_path
+	  base_path
 	end
   end
 end

data/lib/logirel/cli.rb

@@ -11,26 +11,28 @@ module Logirel
 	desc "init", "Convert the current folder's projects (src) into a rake+albacore build"
 	def init(root_dir = Dir.pwd)
       
-      puts "Logirel version #{Logirel::VERSION}"
-	  curr = Dir.pwd
-      
+      puts "logirel"
+      puts "======="
+      curr = Dir.pwd
+      puts "Current dir: #{curr}"
+
       puts ""
       puts "Directories Selection"
       puts "---------------------"
-	  
-	  folder = lambda { |query, default|
-	    StrQ.new(query, default, STDIN, lambda { |dir| 
-		  true # perform validation here if you wish
-		}, STDOUT)
-	  }
-	  
-	  src_folders = Initer.new('./src').parse_folders.inspect
-      dir = folder.call("Source Directory. Default contains (#{src_folders})", "./src").exec
-      buildscripts = folder.call("Buildscripts Directory", "./buildscripts").exec
-	  tools = folder.call("Tools Directory", "./tools").exec
-	  initer = Initer.new(dir)
-	  initer.buildscripts_path = buildscripts
-	  
+      
+      folder = lambda { |query, default|
+        StrQ.new(query, default, STDIN, lambda { |dir| 
+          true # perform validation here if you wish
+        }, STDOUT)
+      }
+      
+      src_folders = Initer.new('.').parse_folders.inspect
+      dir = folder.call("Source Directory. Default contains (#{src_folders})", "src").exec
+      buildscripts = folder.call("Buildscripts Directory", "buildscripts").exec
+      tools = folder.call("Tools Directory", "tools").exec
+      initer = Initer.new(".")
+      initer.buildscripts_path = buildscripts
+      
       puts ""
       puts "Project Selection"
       puts "-----------------"
@@ -38,31 +40,34 @@ module Logirel
       selected_projs = initer.parse_folders.
         find_all { |f| BoolQ.new(f).exec }
 
-	  puts "Selected: #{selected_projs.inspect}"
-	  
+      puts "Selected: #{selected_projs.inspect}"
+      
+      
+      puts "initing semver in folder #{dir}"
+      `semver init`
+      puts "done..."
       puts ""
       puts "Project Meta-Data Definitions"
       puts "-----------------------------"
-	  
-	  puts "initing semver in folder #{dir}"
-	  `semver init`
-      
+      puts "Let's set up some meta-data!"
       metas = selected_projs.map do |p|
         
         base = File.basename(p)
+        
+        puts "META DATA FOR: '#{base}'"
         p_dir = File.join(dir, base)
         
         {
           :dir => p_dir,
-      	  :title => StrQ.new("Title", base).exec,
-      	  :test_dir => StrQ.new("Test Directory", base + ".Tests").exec,
-      	  :description => StrQ.new("Description", "#{base} at commit #{`git log --pretty-format=%H`}").exec,
-      	  :copyright => StrQ.new("Copyright").exec,
-      	  :authors => StrQ.new("Authors").exec,
-      	  :company => StrQ.new("Company").exec,
-      	  :nuget_key => StrQ.new("NuGet key", base).exec,
-      	  :ruby_key => StrQ.new("Ruby key (e.g. 'autotx')").exec,
-      	  :guid => UUID.new
+          :title => StrQ.new("Title", base).exec,
+          :test_dir => StrQ.new("Test Directory", base + ".Tests").exec,
+          :description => StrQ.new("Description", "of #{base}").exec,
+          :copyright => StrQ.new("Copyright").exec,
+          :authors => StrQ.new("Authors").exec,
+          :company => StrQ.new("Company").exec,
+          :nuget_key => StrQ.new("NuGet key", base).exec,
+          :ruby_key => StrQ.new("Ruby key (e.g. 'autotx')").exec,
+          :guid => UUID.new
         }
       end
       

data/lib/logirel/q_model.rb

@@ -6,42 +6,44 @@ module Logirel
   class BoolQ < Q
     attr_accessor :pos_answer, :neg_answer
     
-    def initialize(question, 
-	               default, 
-	               io_source = STDIN, 
-	               io_target = STDOUT)
+    def initialize(question,
+                   default = true,
+                   io_source = STDIN, 
+                   io_target = STDOUT)
       @question = question
-	  @default = default
-	  @io_source = io_source
-	  @io_target = io_target
+      @default = default
+      @io_source = io_source
+      @io_target = io_target
+    end
+
+    def default_str
+      
+      @default ? "[Yn]" : "[yN]"
+      
     end
-	
-	def default_str
-	  @default ? "[Yn]" : "[yN]"
-	end
     
     def exec
       @io_target.print @question + " " + default_str
-	  a = ""
-	  begin
-	    a = @io_source.gets.chomp
-	  end while !a.empty? && !['y', 'n'].include?(a.downcase)
-	  a.empty? ? @default : (a == 'y')	  
+      a = ""
+      begin
+      a = @io_source.gets.chomp
+      end while !a.empty? && !['y', 'n'].include?(a.downcase)
+      a.empty? ? @default : (a == 'y')
     end
   end
   
   class StrQ < Q
     def initialize(question, 
-	               default = nil, 
-	               io_source = STDIN, 
-				   validator = nil,
-				   io_target = STDOUT)
+                   default = nil, 
+                   io_source = STDIN, 
+                   validator = nil,
+                   io_target = STDOUT)
       @question = question
       @default = default    
       @io_source = io_source
       @validator = validator || lambda { |s| true }
-	  @io_target = io_target
-	  @answer = ""
+      @io_target = io_target      
+      @answer = ""
     end
     
     def answer
@@ -50,12 +52,12 @@ module Logirel
     
     def exec
       @io_target.print @question + " [#{@default}]: "
-	  begin
+      begin
         @answer = @io_source.gets.chomp
-	  end while !@answer.empty? && !@validator.call(@answer)
-	  @answer = @answer.empty? ? @default : @answer
-	  @io_target.puts "Chose '#{@answer}'."
-	  @answer
+      end while !@answer.empty? && !@validator.call(@answer)
+      @answer = @answer.empty? ? @default : @answer
+      @io_target.puts "Chose '#{@answer}'."
+      @answer
     end
   end
 end

data/lib/logirel/version.rb

@@ -1,14 +1,21 @@
 module Logirel
   begin
     require 'semver'
-    VERSION = SemVer.find.format "%M.%m.%p"
-	class Version < SemVer
+    begin
+      VERSION = SemVer.find.format "%M.%m.%p"
+    rescue SemVerMissingError
+      VERSION = "0.0.x"
+    end
+
+    class Version < SemVer
       def parse_numeric(str)
-	    str.scan(/(\d{1,5}).?/).flatten.collect{|x| x.to_i}
-	  end
+        str.scan(/(\d{1,5}).?/).flatten.collect{|x| x.to_i}
+      end
     end
+
   rescue LoadError
     puts 'First time installing, eh? Just run "bundle install"! (unless this is you running it right now!)'
-    VERSION = "0.0.0"
+    VERSION = "0.0.x"
   end
+
 end

data/logirel.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "memoize"
   s.add_development_dependency "devver-construct"
   s.add_dependency "albacore", "~> 0.2.5"
-  s.add_dependency "semver", "~> 1.0.1"
+  s.add_dependency "semver", "~> 1.0.6"
   s.add_dependency "bundler", "~> 1.0.14"
   s.add_dependency "thor"
   s.add_dependency "uuid"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logirel
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-28 00:00:00.000000000Z
+date: 2011-06-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19696860 !ruby/object:Gem::Requirement
+  requirement: &20363640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *19696860
+  version_requirements: *20363640
 - !ruby/object:Gem::Dependency
   name: memoize
-  requirement: &19696584 !ruby/object:Gem::Requirement
+  requirement: &20363364 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19696584
+  version_requirements: *20363364
 - !ruby/object:Gem::Dependency
   name: devver-construct
-  requirement: &19696224 !ruby/object:Gem::Requirement
+  requirement: &20363052 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19696224
+  version_requirements: *20363052
 - !ruby/object:Gem::Dependency
   name: albacore
-  requirement: &19695828 !ruby/object:Gem::Requirement
+  requirement: &20362536 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +54,21 @@ dependencies:
         version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *19695828
+  version_requirements: *20362536
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &19695396 !ruby/object:Gem::Requirement
+  requirement: &20362056 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *19695396
+  version_requirements: *20362056
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19694976 !ruby/object:Gem::Requirement
+  requirement: &20361588 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *19694976
+  version_requirements: *20361588
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &19694544 !ruby/object:Gem::Requirement
+  requirement: &20361192 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19694544
+  version_requirements: *20361192
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &19694076 !ruby/object:Gem::Requirement
+  requirement: &20360760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19694076
+  version_requirements: *20360760
 description: ! "The gem works by having as its dependencies \n  everything you need
   to get started with OSS and proprietary .Net coding.\n  The aim of the gem is to
   allow developers to get up and running quickly\n  and provide a nice way of converting
@@ -123,7 +123,6 @@ files:
 - lib/logirel/NuGet.rb
 - lib/logirel/cli.rb
 - lib/logirel/details_emitter.rb
-- lib/logirel/logirel.rb
 - lib/logirel/q_model.rb
 - lib/logirel/querier.rb
 - lib/logirel/version.rb
@@ -149,7 +148,7 @@ files:
 - vendor/cache/rspec-expectations-2.6.0.gem
 - vendor/cache/rspec-mocks-2.6.0.gem
 - vendor/cache/rubyzip-0.9.4.gem
-- vendor/cache/semver-1.0.1.gem
+- vendor/cache/semver-1.0.5.gem
 - vendor/cache/thor-0.14.6.gem
 - vendor/cache/uuid-2.3.2.gem
 homepage: https://github.com/haf/logirel