logirel 0.1.3 → 0.1.4

data/.semver

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

data/README.md

@@ -4,10 +4,11 @@ Getting started
 ===============
  1. `gem install logirel`
  1. Go to the project of your choice
- 1. `logirel init`
+ 1. `logirel`
  1. You should now answer the questions that logirel poses.
  1. after it's done, run `rake`.
 
+**[Apache 2 Licensed](http://www.apache.org/licenses/LICENSE-2.0.html)**
  
 Hacking it
 ==========

data/lib/logirel/cli.rb

@@ -29,7 +29,7 @@ module Logirel
     method_option "root", :type => :string, :banner => "Perform the initialization in the given root directory"
     method_option "raketempl", :type => :string, :banner => "Specify the initialization template to use"
     def init(root = Dir.pwd, raketempl = 'Rakefile.tt')
-      opts = options.dup
+      #opts = options.dup
       helper = CliHelper.new root
       @root = root
 
@@ -58,7 +58,8 @@ module Logirel
       run 'git add .'
 
       # 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
+      build_sln = BoolQ.new("add msbuild task for sln file?", true).exec
+      msbuild_task BoolQ.new("Set this task up as rake default task?", true).exec if build_sln
 
       helper.say_goodbye
     end

data/lib/logirel/tasks/msbuild.rb

@@ -1,14 +1,23 @@
 module Logirel::Tasks
-  def msbuild_task(sln_file_path = nil, opts={})
+  def msbuild_task(add_as_default = true, opts={})
     #sln_file_path = tuck_and_get :sln_file_path, sln_file_path
+    #add_as_default = tuck_and_get :add_as_default, add_as_default
+
+    if add_as_default
+      append_to_file File.join(@root, BUILD_FILE), <<-EOF, :verbose => false
+
+  task :default => ["env:release", #{ inject_task_name opts, 'msbuild' }]
+
+      EOF
+    end
 
     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
+msbuild #{ inject_task_name opts, 'msbuild' }#{ inject_dependency opts } do |msb|
+  msb.solution   = FILES[:sln]
+  msb.properties :Configuration => CONFIGURATION
+  msb.targets    :Clean, :Build
 end
     EOF
   end

data/lib/logirel/templates/Rakefile.tt

@@ -13,5 +13,3 @@ 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/environment.tt

@@ -9,7 +9,7 @@ namespace :env do
     fv = version SemVer.find.to_s
     revision = (!fv[3] || fv[3] == 0) ? (ENV['BUILD_NUMBER'] || Time.now.strftime('%j%H')) : fv[3] #  (day of year 0-265)(hour 00-24)
 
-    ENV['BUILD_VERSION'] = BUILD_VERSION = SemVer.new(fv[0], fv[1], fv[2], revision).to_s
+    ENV['BUILD_VERSION'] = BUILD_VERSION = "#{SemVer.new(fv[0], fv[1], fv[2]).to_s}.#{revision}"
     puts "Assembly Version: #{BUILD_VERSION}."
     puts "##teamcity[buildNumber '#{BUILD_VERSION}']" # tell teamcity our decision
 
@@ -32,7 +32,7 @@ namespace :env do
     CLEAN.include(FOLDERS[:<%=k%>][:out])
 
     # for tests
-    FOLDERS[:<%=k%>] = File.join(FOLDERS[:src], PROJECTS[:<%=k%>][:test_dir], 'bin', CONFIGURATION)
+    FOLDERS[:<%=k%>][:test_out] = File.join(FOLDERS[:src], PROJECTS[:<%=k%>][:test_dir], 'bin', CONFIGURATION)
     FILES[:<%=k%>][:test] = File.join(FOLDERS[:<%=k%>][:test_out], "#{PROJECTS[:<%=k%>][:test_dir]}.dll")
     CLEAN.include(FOLDERS[:test_out])
 <% end %>

data/lib/logirel/templates/paths.tt

@@ -3,7 +3,7 @@ require "<%=folders[:buildscripts]%>/project_details"
 
 # The folders array denoting where to place build artifacts
 
-FOLDERS = {
+folders = {
   :root => root_folder,
   :src => "<%= folders[:src] %>",
   :build => "<%= folders[:build] %>",
@@ -14,11 +14,11 @@ FOLDERS = {
   :nuspec => "<%= folders[:nuspec] %>"
 }
 
-FOLDERS.merge({
+FOLDERS = folders.merge({
 <% metas.each do |m| %>
   :<%=m[:ruby_key]%> => {
       :test_dir => '<%= m[:test_dir] %>',
-      :nuspec => '#{FOLDERS[:nuspec]}/#{PROJECTS[<%= m[:ruby_key] %>][:nuget_key]}',
+      :nuspec => "#{folders[:nuspec]}/#{PROJECTS[:<%= m[:ruby_key] %>][:nuget_key]}",
       :out => 'placeholder - environment.rb will sets this',
       :test_out => 'placeholder - environment.rb sets this'
   },
@@ -29,15 +29,15 @@ FILES = {
   :sln => "<%= files[:sln] %>",
   <% metas.each do |m| %>
   :<%= m[:ruby_key] %> => {
-    :nuspec => File.join(FOLDERS[:<%= m[:ruby_key] %>][:nuspec], "#{PROJECTS[:<%= m[:ruby_key] %>][:nuget_key]}.nuspec")
+    :nuspec => "todo" # File.join(FOLDERS[:<%= m[:ruby_key] %>][:nuspec], "#{PROJECTS[:<%= m[:ruby_key] %>][:nuget_key]}.nuspec")
   },
   <% end %>
 }
 
 COMMANDS = {
-  :nunit => File.join(FOLDERS[:nunit], "nunit-console.exe"),
   :nuget => File.join(FOLDERS[:tools], "NuGet.exe"),
   :ilmerge => File.join(FOLDERS[:tools], "ILMerge.exe")
+  # nunit etc
 }
 
 URIS = {

data/lib/logirel/version.rb

@@ -1,5 +1,5 @@
 module Logirel
-  VERSION = "0.0.x"
+  VERSION = "0.1.x"
   begin
     require 'semver'
     class Version < SemVer

data/logirel.gemspec

@@ -32,10 +32,11 @@ Gem::Specification.new do |s|
   s.add_dependency "bundler", "~> 1.0.14"
   s.add_dependency "thor", "~> 0.14.6"
   s.add_dependency "uuid", "~> 2.3.2"
-  s.add_dependency "nokogiri",   "~>1.4.4"
+  s.add_dependency "nokogiri", "~>1.4.4"
+  s.add_dependency "rubyzip", "~>0.9.4"
   
   s.requirements << '.Net or Mono installation'
   s.requirements << 'xbuild (on linux) or msbuild (on windows) for csproj files'
   s.requirements << 'Access to the internet w/o a proxy! ;)'
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logirel
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-07 00:00:00.000000000Z
+date: 2011-08-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &28708020 !ruby/object:Gem::Requirement
+  requirement: &21961584 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *28708020
+  version_requirements: *21961584
 - !ruby/object:Gem::Dependency
   name: memoize
-  requirement: &28707348 !ruby/object:Gem::Requirement
+  requirement: &21961164 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28707348
+  version_requirements: *21961164
 - !ruby/object:Gem::Dependency
   name: devver-construct
-  requirement: &28706124 !ruby/object:Gem::Requirement
+  requirement: &21960708 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28706124
+  version_requirements: *21960708
 - !ruby/object:Gem::Dependency
   name: albacore
-  requirement: &28705476 !ruby/object:Gem::Requirement
+  requirement: &21960312 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *28705476
+  version_requirements: *21960312
 - !ruby/object:Gem::Dependency
   name: semver2
-  requirement: &28704660 !ruby/object:Gem::Requirement
+  requirement: &21959928 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *28704660
+  version_requirements: *21959928
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &28221732 !ruby/object:Gem::Requirement
+  requirement: &21959580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *28221732
+  version_requirements: *21959580
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &28221072 !ruby/object:Gem::Requirement
+  requirement: &21959208 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *28221072
+  version_requirements: *21959208
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &28220364 !ruby/object:Gem::Requirement
+  requirement: &21958788 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *28220364
+  version_requirements: *21958788
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &28219728 !ruby/object:Gem::Requirement
+  requirement: &21885516 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,18 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *28219728
+  version_requirements: *21885516
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &21885216 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *21885216
 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