azbuild 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd31122ef0433d9f336363b3520e37f65dbe998
-  data.tar.gz: db43f71b5389bce1cdfa6fa1813b4ab47995e075
+  metadata.gz: d78d96005c1da5d131c79d6166a8bcffe00413e6
+  data.tar.gz: 51aeeffe0146bb51fa2ae818dd69cddebda1e876
 SHA512:
-  metadata.gz: b4a3bb23e54dde91438bb9595e0c6bd4fb87659565b5fadcee092693b222bae414c31ae10581235465d43747059430130a88bddac5fcececa70f0293f9c8327c
-  data.tar.gz: 38620c4ca8039268a4c59d5dc46184ccb96a1fbeacdf38082c706dd43c08f9b17984caf0809ba39e4929749d331603816fdbfb8bfe77d81295dd17b47cd61f63
+  metadata.gz: dc62be0a1cb5cd3ec16dd52713a0a0a48637824d223f02c9ea7e3e4e659f0854a241ddbeeb6066cb6988e650d1d0e8a40559da4014f6b7828c492392bf923936
+  data.tar.gz: 961efb3f515433b899f0537bfb08255498463c3e2399bf3eae7c38ba807136fd7c323f3c731484c0780c21eb5bbbbe7b5133dc05b489e39b14cbe4b57743b1c0

data/azbuild.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'azbuild'
-  s.version     = '1.0.2'
-  s.date        = '2016-11-08'
+  s.version     = '1.0.3'
+  s.date        = '2017-03-27'
   s.summary     = 'Setup and scripting support for .Net project builds'
   s.description = 'Build, Configuration and Deployment Gem for .Net Solutions'
   s.authors     = ['Suresh Batta']

data/lib/build.rb

@@ -67,21 +67,21 @@ def cleantask props
   end
 end
 
-def run_vsconsole_tests settings, params = nil, assemblies = nil
+def run_vsconsole_tests settings, outdir, params = nil, assemblies = nil
 
   raise 'Settings file name is required' if settings.nil?
 
   if assemblies.nil?
-    assemblies = FileList["**/#{OUTPUT_PATH}/*.Tests.dll"]
+    assemblies = FileList["**/#{outdir}/**/*.Tests.dll"]
     filelist = assemblies.map { |assembly| File.join(Dir.pwd, assembly)}
   end
 
   test_runner :tests do |tests|
     tests.files = filelist
-    tests.exe = 'C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/CommonExtensions/Microsoft/TestWindow/VSTest.console.exe'
+    tests.exe = "C:/Program\ Files\ (x86)/Microsoft\ Visual\ Studio\ 14.0/Common7/IDE/CommonExtensions/Microsoft/TestWindow/VSTest.console.exe"
     if (params != nil)
       params.each { | p |
-        tests.add_parameter p 
+        tests.add_parameter p
       }
     end
     tests.add_parameter '/InIsolation'

data/lib/package.rb

@@ -3,74 +3,62 @@ def nuget_pack id, config, artifact_path
 
   p = Albacore::NugetsPack::Config.new
 
-  p.configuration = BUILD_CONFIG
-
-  if !config.has_key? :projects || config[:projects] == ''
-    raise 'At least one project is required to build'.red
-  end
-
-  p.files = config[:projects]
+  p.configuration = config[:build_config]
 
   if config.has_key? :nuspec && config[:nuspec] != ''
     p.nuspec = config[:nuspec]
+  else
+    if !config.has_key? :projects || config[:projects] == ''
+      raise 'At least one project is required to build'.red
+    else
+      p.files = config[:projects]
+    end
+    
+    p.with_package do |p|
+      if config.has_key? :files
+        config[:files].each { |folder, files|
+          files.map!{ |x| 
+            "#{config[:path]}/#{config[:company]}.#{x}".expand_with(['dll','pdb','xml'])
+          }
+          files = files.flatten
+
+          files.each{ |file|
+            p.add_file file, folder
+          }
+        }
+      end
+    end
   end
 
   p.out = artifact_path
 
   p.with_metadata do |m|
     m.id = id
-    m.title = PRODUCT
-    m.description = PRODUCT_DESCRIPTION
-    m.authors = COMPANY
+    m.title = config[:title]
+    m.description = config[:description]
+    m.copyright = config[:copyright]
+    m.authors = config[:authors]
     m.version = config[:version]
     if config.has_key? :dependencies
       config[:dependencies].each { |name, version|
         m.add_dependency name, version
       }
     end
-  end
-
-  p.target = config[:target_framework]
-  p.with_package do |p|
-    if config.has_key? :files
-      config[:files].each { |folder, files|
-        files.each{ |file|
-          p.add_file file, folder
-        }
+    if config.has_key? :framework_dependencies
+      config[:framework_dependencies].each { |name, version|
+        m.add_framework_dependency name, version
       }
-    end
+    end 
   end
+ 
+  p.target = config[:target_framework]
   
-  p.gen_symbols
+  #p.gen_symbols
   p.nuget_gem_exe
-  #p.leave_nuspec
 
+  #p.leave_nuspec
+  puts 'Nuget configuration set complete. Creating nuget...'
   Albacore::NugetsPack::ProjectTask.new(p.opts).execute
-end
-
-def nuget_content nuget_name, path, dotnet_ver
-
-  content = {}
-
-  metadata = SemVerMetadata.new ".semver/#{nuget_name}.semver"
+  puts 'Nuget created'
 
-  content[:files] = {}
-  content[:files]['lib'] = metadata.files
-
-  file_names = metadata.assemblies.map{ |x|
-    "#{path}/#{x}"
-  }
-  assemblies = []
-  file_names.each{ |file|
-    assemblies.concat(file.expand_with(['dll','pdb','xml']))
-  }
-  content[:files]['lib'].concat assemblies
-
-  content[:dependencies] = metadata.depends
-
-  content[:version] = read_versions[nuget_name][:nuget_version]
-  content[:target_framework] = dotnet_ver
-
-  content
 end
-

data/lib/versioning.rb

@@ -15,6 +15,22 @@ def get_commit_hash_and_date
   [commit, commit_date]
 end
 
+# read version info from solutioninfo.cs file
+def read_solution_version
+  version = ''
+  File.open('SolutionInfo.cs', 'r').each_line do |line|
+    if line.include?('AssemblyVersion')
+      version = line[/\(.*?\)/]
+      break
+    end
+  end
+  ver = SemVer.parse version
+  
+  $version_map[ASTER] = versions(ver, &method(:commit_data))
+
+  $version_map
+end
+
 # put semver versions in a map
 def read_versions
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azbuild
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Suresh Batta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies: []
 description: Build, Configuration and Deployment Gem for .Net Solutions
 email: subatta@hotmail.com