logirel 0.1.0 → 0.1.1

data/.semver

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

data/lib/logirel/cli.rb

@@ -30,9 +30,11 @@ module Logirel
     method_option "raketempl", :type => :string, :banner => "Specify the initialization template to use"
     def init(root = Dir.pwd, raketempl = 'Rakefile.tt')
       opts = options.dup
-      helper = CliHelper.new opts.fetch("root", root)
+      helper = CliHelper.new root
+      @root = root
 
       puts "logirel v#{Logirel::VERSION}"
+      puts ""
       @folders = helper.folders_selection
       @files = helper.files_selection folders
 
@@ -40,7 +42,7 @@ module Logirel
       selected_projs = helper.parse_folders(folders[:src]).find_all { |f| BoolQ.new(f).exec }
 
       puts ""
-      @metas = selected_projs.empty? ? [] : helper.metadata_interactive(selected_projs)
+      @metas = selected_projs.empty? ? [] : helper.metadata_interactive(selected_projs, @folders)
 
       puts "initing main environment"
       run 'semver init'
@@ -51,11 +53,12 @@ module Logirel
       template 'paths.tt',            File.join(root, folders[:buildscripts], 'paths.rb')
       template 'environment.tt',      File.join(root, folders[:buildscripts], 'environment.rb')
       template 'utils.tt',            File.join(root, folders[:buildscripts], 'utils.rb')
-      template raketempl,             File.join(root, 'Rakefile.rb')
+      template raketempl,             File.join(root, BUILD_FILE)
       run 'git init'
       run 'git add .'
-      # TODO: add a few nuget, nuspec, owrap, fpm, puppet etc tasks here!
 
+      # TODO: add a few nuget, nuspec, owrap, fpm, puppet etc tasks here!
+      msbuild_task @files[:sln] if BoolQ.new("add msbuild task for sln file?", true).exec
 
       helper.say_goodbye
     end

data/lib/logirel/cli_helper.rb

@@ -28,28 +28,33 @@ module Logirel
           empty? ? 'which is empty.' : 'which contains folders.'}"
       puts ""
 
+      build_dir =   StrQ.new("Build Output Directory", "build").exec
       {
           :src => StrQ.new("Source Directory. Default (src) contains (#{parse_folders('src').inspect})", 'src').exec,
           :buildscripts => StrQ.new("Buildscripts Directory", "buildscripts").exec,
-          :build => StrQ.new("Build Output Directory", "build").exec,
-          :tools => StrQ.new("Tools Directory", "tools").exec
+          :build => build_dir,
+          :tools => StrQ.new("Tools Directory", "tools").exec,
+          :tests => StrQ.new("Test Output Directory", "#{build_dir}/tests").exec,
+          :nuget => StrQ.new("NuGet Directory", "#{build_dir}/nuget").exec,
+          :nuspec => StrQ.new("NuSpec Directory", "#{build_dir}/nuspec").exec
       }
     end
 
     # folders: hash (as defined above), of folder paths
     def files_selection folders
       puts "Looking at src folder: '#{folders[:src]}'."
+      first_sln = Dir.glob(File.join(@root_dir, folders[:src],"*.sln")).first
       {
-          :sln => StrQ.new("sln file", Dir.glob(File.join(@root_dir, folders[:src],"*.sln")).first).exec
+          :sln => StrQ.new("sln file", File.join(folders[:src], File.basename(first_sln))).exec
       }
     end
 
-    def metadata_interactive selected_projs
+    def metadata_interactive selected_projs, selected_folders
       puts "Project Meta-Data Definitions"
       puts "-----------------------------"
       puts "Let's set up some meta-data!"
       puts ""
-      selected_projs.map { |p| meta_for p }
+      selected_projs.map { |p| meta_for p, selected_folders[:src] }
     end
 
     def say_goodbye
@@ -63,16 +68,17 @@ module Logirel
     end
 
     private
-    def meta_for p
+    def meta_for p, src_dir
       base = File.basename(p)
 
-      puts "META DATA FOR: '#{base}'"
-      p_dir = File.join(@root_dir, base)
+      puts "META DATA FOR DIRECTORY: '#{src_dir}/#{base}'"
+      title = StrQ.new("Title", base).exec
 
       {
-          :title => StrQ.new("Title", base).exec,
-          :dir => p_dir,
-          :test_dir => StrQ.new("Test Directory", base + ".Tests").exec,
+          :title => title,
+          :id => base,
+          :dir => File.join(src_dir, base),
+          :test_dir => StrQ.new("Test Directory", title + ".Tests").exec,
           :description => StrQ.new("Description", "Missing description for #{base}").exec,
           :copyright => StrQ.new("Copyright").exec,
           :authors => StrQ.new("Authors").exec,

data/lib/logirel/tasks/albacore_tasks.rb

@@ -3,6 +3,7 @@ require 'logirel/tasks/core'
   aspnet
   assembly_info
   aspnet
+  msbuild
   ncover
   nuget
   nuspec

data/lib/logirel/tasks/core.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 module Logirel::Tasks
   include FileUtils
 
-  BUILD_FILE = 'Rakefile'
+  BUILD_FILE = 'Rakefile.rb'
 
 
   def unzip(zipfile, opts)

data/lib/logirel/tasks/msbuild.rb

@@ -0,0 +1,15 @@
+module Logirel::Tasks
+  def msbuild_task(sln_file_path = nil, opts={})
+    #sln_file_path = tuck_and_get :sln_file_path, sln_file_path
+
+    append_to_file File.join(@root, BUILD_FILE), <<-EOF, :verbose => false
+
+desc "build sln file"
+nugetpack #{ inject_task_name opts, 'msbuild' }#{ inject_dependency opts } do |msb|
+   msb.solution   = "#{sln_file_path}"
+   msb.properties :Configuration => :Debug
+   msb.targets    :Clean, :Build
+end
+    EOF
+  end
+end

data/lib/logirel/templates/Gemfile.tt

@@ -2,5 +2,5 @@ source "http://rubygems.org"
 
 gem 'rake'
 gem 'albacore'
-gem 'semver'
+gem 'semver2'
 gem 'bundler'

data/lib/logirel/templates/Rakefile.tt

@@ -1,9 +1,17 @@
 require "rubygems"
 require "bundler"
 Bundler.setup
+$: << './'
 
 require 'albacore'
 require 'rake/clean'
 require 'semver'
 
-# to get the current version of the project, type 'SemVer.find.to_s' in this rake file.
+require '<%= folders[:buildscripts] %>/utils'
+require '<%= folders[:buildscripts] %>/paths'
+require '<%= folders[:buildscripts] %>/project_details'
+require '<%= folders[:buildscripts] %>/environment'
+
+# to get the current version of the project, type 'SemVer.find.to_s' in this rake file.
+
+# task :default => :msbuild

data/lib/logirel/templates/paths.tt

@@ -8,23 +8,28 @@ FOLDERS = {
   :src => "<%= folders[:src] %>",
   :build => "<%= folders[:build] %>",
   :binaries => "placeholder - environment.rb sets this depending on target",
-  :tests => "<%= folders[:tests] %>",
   :tools => "<%= folders[:tools] %>",
+  :tests => "<%= folders[:tests] %>",
   :nuget => "<%= folders[:nuget] %>",
-  <% metas.each do |m| %>
+  :nuspec => "<%= folders[:nuspec] %>"
+}
+
+FOLDERS.merge({
+<% metas.each do |m| %>
   :<%=m[:ruby_key]%> => {
       :test_dir => '<%= m[:test_dir] %>',
+      :nuspec => '#{FOLDERS[:nuspec]}/#{PROJECTS[<%= m[:ruby_key] %>][:nuget_key]}',
       :out => 'placeholder - environment.rb will sets this',
       :test_out => 'placeholder - environment.rb sets this'
   },
   <% end %>
-}
+})
 
 FILES = {
   :sln => "<%= files[:sln] %>",
   <% metas.each do |m| %>
   :<%= m[:ruby_key] %> => {
-    :nuspec => File.join(FOLDERS[:<%= m[:ruby_key] %>], "#{PROJECTS[:<%= m[:ruby_key] %>][:id]}.nuspec")
+    :nuspec => File.join(FOLDERS[:<%= m[:ruby_key] %>][:nuspec], "#{PROJECTS[:<%= m[:ruby_key] %>][:nuget_key]}.nuspec")
   },
   <% end %>
 }

data/logirel.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 2.6.0"  
   s.add_development_dependency "memoize"
   s.add_development_dependency "devver-construct"
-  s.add_dependency "albacore", "~> 0.2.6"
+  s.add_dependency "albacore", "= 0.2.5"
   s.add_dependency "semver2", "~> 2.0.0"
   s.add_dependency "bundler", "~> 1.0.14"
   s.add_dependency "thor", "~> 0.14.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logirel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26871312 !ruby/object:Gem::Requirement
+  requirement: &21852816 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *26871312
+  version_requirements: *21852816
 - !ruby/object:Gem::Dependency
   name: memoize
-  requirement: &26870364 !ruby/object:Gem::Requirement
+  requirement: &21852552 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26870364
+  version_requirements: *21852552
 - !ruby/object:Gem::Dependency
   name: devver-construct
-  requirement: &24002988 !ruby/object:Gem::Requirement
+  requirement: &21851580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24002988
+  version_requirements: *21851580
 - !ruby/object:Gem::Dependency
   name: albacore
-  requirement: &24002448 !ruby/object:Gem::Requirement
+  requirement: &21851136 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *24002448
+  version_requirements: *21851136
 - !ruby/object:Gem::Dependency
   name: semver2
-  requirement: &24001740 !ruby/object:Gem::Requirement
+  requirement: &21850776 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *24001740
+  version_requirements: *21850776
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24000936 !ruby/object:Gem::Requirement
+  requirement: &21850476 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *24000936
+  version_requirements: *21850476
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &23996916 !ruby/object:Gem::Requirement
+  requirement: &21850200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *23996916
+  version_requirements: *21850200
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &23995920 !ruby/object:Gem::Requirement
+  requirement: &21849888 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *23995920
+  version_requirements: *21849888
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &23995224 !ruby/object:Gem::Requirement
+  requirement: &21849588 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *23995224
+  version_requirements: *21849588
 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
@@ -139,6 +139,7 @@ files:
 - lib/logirel/tasks/aspnet.rb
 - lib/logirel/tasks/assembly_info.rb
 - lib/logirel/tasks/core.rb
+- lib/logirel/tasks/msbuild.rb
 - lib/logirel/tasks/ncover.rb
 - lib/logirel/tasks/nuget.rb
 - lib/logirel/tasks/nunit.rb
@@ -164,17 +165,18 @@ files:
 - spec/queries/string_query_spec.rb
 - spec/support/with_sample_projects.rb
 - spec/version_spec.rb
-- vendor/cache/albacore-0.2.6.gem
+- vendor/cache/albacore-0.2.5.gem
 - vendor/cache/devver-construct-1.1.0.gem
 - vendor/cache/diff-lcs-1.1.2.gem
 - vendor/cache/macaddr-1.0.0.gem
 - vendor/cache/memoize-1.3.1.gem
-- vendor/cache/nokogiri-1.4.6-x86-mingw32.gem
+- vendor/cache/nokogiri-1.4.7-x86-mingw32.gem
 - vendor/cache/rspec-2.6.0.gem
 - vendor/cache/rspec-core-2.6.4.gem
 - vendor/cache/rspec-expectations-2.6.0.gem
 - vendor/cache/rspec-mocks-2.6.0.gem
-- vendor/cache/semver-1.0.6.gem
+- vendor/cache/rubyzip-0.9.4.gem
+- vendor/cache/semver2-2.0.0.gem
 - vendor/cache/thor-0.14.6.gem
 - vendor/cache/uuid-2.3.2.gem
 homepage: https://github.com/haf/logirel