bozo-scripts 0.6.0 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/bozo/compilers/msbuild.rb

@@ -17,7 +17,7 @@ module Bozo::Compilers
 
       config = defaults.merge @config
       config[:targets] = (@targets or default_targets).clone
-      config[:websites_as_zip] = false
+      config[:websites_as_zip] ||= false
       config
     end
 
@@ -47,7 +47,7 @@ module Bozo::Compilers
       @exclude_projects << project_name
     end
 
-    def websites_as_zip?
+    def websites_as_zip
       @config[:websites_as_zip] = true
     end
 
@@ -207,8 +207,12 @@ module Bozo::Compilers
       path.gsub(/\//, '\\')
     end
 
+    def temp_project_path
+      File.expand_path(File.join('temp', 'msbuild', @project_name))
+    end
+
     def location
-      File.expand_path(File.join('temp', 'msbuild', @project_name, framework_version))
+      File.expand_path(File.join(temp_project_path, framework_version))
     end
 
     private
@@ -244,8 +248,12 @@ module Bozo::Compilers
     def populate_config(config)
       config[:targets] << :package
 
-      config[:properties][:packagelocation] = location + '/Site.zip'
-      config[:properties][:packageassinglefile] = true
+      if config[:websites_as_zip]
+        config[:properties][:packagelocation] = location + '/Site.zip'
+        config[:properties][:packageassinglefile] = true
+      else
+        config[:properties][:_packagetempdir] = temp_project_path
+      end
 
       config[:properties][:solutiondir] = windowsize_path(File.expand_path('.') + '//')
     end

data/lib/bozo/packagers/nuget.rb

@@ -3,21 +3,25 @@ require 'nokogiri'
 module Bozo::Packagers
 
   class Nuget
-    
+
     def initialize
       @libraries = []
       @executables = []
       @websites = []
     end
-    
+
     def destination(destination)
       @destination = destination
     end
-    
+
     def library(project, *extfiles)
       @libraries << LibraryPackage.new(project, extfiles, self)
     end
 
+    def library_with_option(project, opts = {})
+      @libraries << LibraryPackage.new(project, opts[:extfiles], self, opts[:excluded_references])
+    end
+
     def executable(project)
       @executables << ExecutablePackage.new(project)
     end
@@ -25,7 +29,7 @@ module Bozo::Packagers
     def website(project)
       @websites << WebsitePackage.new(project)
     end
-    
+
     def required_tools
       :nuget
     end
@@ -41,11 +45,11 @@ module Bozo::Packagers
     def author(author)
       @author = author
     end
-    
+
     def to_s
       "Publish projects with nuget #{@libraries | @executables | @websites} to #{@destination}"
     end
-    
+
     def execute
       @libraries.each {|project| package project}
       @executables.each {|project| package project}
@@ -63,7 +67,7 @@ module Bozo::Packagers
       spec_path = generate_specification(project)
       create_package(project.name, spec_path, true)
     end
-    
+
     def generate_specification(project)
       log_debug "Generating specification for #{project.name}"
       builder = Nokogiri::XML::Builder.new do |doc|
@@ -93,27 +97,27 @@ module Bozo::Packagers
       File.open(spec_path, 'w+') {|f| f.write(builder.to_xml)}
       spec_path
     end
-    
+
     def create_package(project, spec_path, omit_analysis = false)
       args = []
-      
+
       dist_dir = File.expand_path(File.join('dist', 'nuget'))
-      
+
       args << File.expand_path(File.join('build', 'tools', 'nuget', 'NuGet.exe'))
       args << 'pack'
       args << "\"#{spec_path}\""
       args << '-OutputDirectory'
       args << "\"#{dist_dir}\""
       args << '-NoPackageAnalysis' if omit_analysis
-      
+
       # Ensure the directory is there because Nuget won't make it
       FileUtils.mkdir_p dist_dir
-      
+
       log_debug "Creating nuget package for #{project}"
-      
+
       execute_command :nuget, args
     end
-    
+
   end
 
   private
@@ -133,17 +137,18 @@ module Bozo::Packagers
     end
 
     def files
-      [{:src => File.expand_path(File.join('temp', 'msbuild', @name, '**', '*.*')).gsub(/\//, '\\'), :target => 'exe'}]
+      [{:src => File.expand_path(File.join('temp', 'msbuild', @name, '**', '*.*')).gsub(/\//, '\\')}]
     end
 
   end
 
   class LibraryPackage
 
-    def initialize(project, extfiles, nuget)
+    def initialize(project, extfiles, nuget, excluded_references = [])
       @name = project
       @nuget = nuget
       @extfiles = extfiles
+      @excluded_references = excluded_references
     end
 
     def name
@@ -186,7 +191,7 @@ module Bozo::Packagers
       doc = Nokogiri::XML(File.open(package_file))
 
       doc.xpath('//packages/package').map do |node|
-        {:id => node[:id], :version => "[#{node[:version]}]"}
+        {:id => node[:id], :version => "[#{node[:version]}]"} unless @excluded_references.include? node[:id]
       end
     end
 
@@ -221,9 +226,9 @@ module Bozo::Packagers
     end
 
     def files
-      [{:src => File.expand_path(File.join('temp', 'msbuild', @name, '**', '*.*')).gsub(/\//, '\\'), :target => 'website'}]
+      [{:src => File.expand_path(File.join('temp', 'msbuild', @name, '**', '*.*')).gsub(/\//, '\\')}]
     end
 
   end
-  
+
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: bozo-scripts
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
+  prerelease: 
 platform: ruby
 authors:
 - Garry Shutler
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bozo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -89,8 +100,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- VERSION
 - lib/bozo/compilers/msbuild.rb
 - lib/bozo/configuration.rb
 - lib/bozo/dependency_resolvers/bundler.rb
@@ -110,7 +119,6 @@ files:
 - lib/bozo/preparers/common_assembly_info.rb
 - lib/bozo/preparers/file_templating.rb
 - lib/bozo/preparers/sql_server.rb
-- lib/bozo/preparers/sql_server.rb~
 - lib/bozo/publishers/file_copy.rb
 - lib/bozo/publishers/nuget.rb
 - lib/bozo/publishers/rubygems.rb
@@ -122,27 +130,36 @@ files:
 - lib/bozo/tools/opencover.rb
 - lib/bozo/version.rb
 - lib/bozo_scripts.rb
+- VERSION
+- LICENSE
 homepage: https://github.com/zopaUK/bozo-scripts
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1042312893
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1042312893
 requirements: []
 rubyforge_project: bozo-scripts
-rubygems_version: 2.4.8
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Zopa build system scripts
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWM1NGNlOTgzNTVjZmM3NzkyMjE1YjZkODkyYmFkMzQwMDI4YmNlZQ==
-  data.tar.gz: !binary |-
-    OTJiODk1OWFmN2JkYjI0YjIxMGI3YTFiM2EwZWY1ZGM3NGUxMGRkMA==
-SHA512:
-  metadata.gz: !binary |-
-    OTZhOTk2M2UxYmVhYjgzMDE3N2FlMWMzNzRjMGRkMzQxZTA0YmViZWZkNTlh
-    MTYyMzBmY2RjZTBhZTY0OTMxNDZlMzRlYjAwMjdlNzU0YzRlZGIyZDkyYjRh
-    ZTgyMmQ0NmI2NjkwNDI0MjdjNzQzZGY2OWRkMzFmY2U5NDk4MmQ=
-  data.tar.gz: !binary |-
-    NDY2Y2NiYTgyNzY0ODE0Y2FlYmYyMzBhOGQzM2RlY2U5YWZiMDRkNGY0NGFh
-    ODEwMzFkMjM4NWEwZDFlNWVjMWM2YWUyYWRhZjg0MGQzYWYyNzQwNmMwZTA5
-    MDg2NWQzNWRhNjRjOWI1YTk0ZWQ2ODQ1N2VkZWM1NzMyZjk0OWM=

data/lib/bozo/preparers/sql_server.rb~

@@ -1,93 +0,0 @@
-module Bozo::Preparers
-
-  # Executes a sql script
-  #
-  # == Hook configuration
-  #
-  #   prepare :sql_server do |t|
-  #     t.variable 'DatabaseName', 'MyDatabase'
-  #     t.variable 'MySecondVariable', 'HelloWorld'
-  #     t.script 'my/specific/script.sql' # must be a specific file
-  #     t.connection_string { |c| c[:config_value] } # a function taking the configuration as an argument
-  #   end
-  #
-  # The variables are accessible via `$(KEY)` in the sql script.
-  class SqlServer
-
-    def execute
-      configuration = load_config
-
-      execute_command :sqlcmd, generate_args(configuration)
-    end
-
-    def variable(key, value)
-      @variables ||= {}
-      @variables[key] = value
-    end
-
-    def script(value)
-      @script = value
-    end
-
-    def database_name(name)
-	    @database_name = name
-    end
-
-    def connection_string(&value)
-      @connection_string = value
-    end
-
-    private
-
-    def generate_args(configuration)
-      connection_string = @connection_string.call(configuration)
-
-      if connection_string.nil? || connection_string.length == 0
-        raise Exception.new('No connection string specified')
-      end
-
-      args = []
-      args << 'sqlcmd'
-      args << "-S #{connection_string}"
-      args << "-i #{@script}"
-      @variables.each do |key, value|
-        args << "-v #{key}=#{value}"
-      end
-
-      args
-    end
-
-    def load_config
-      default_files = ['default.rb', "#{environment}.rb"]
-      default_files << "#{env['MACHINENAME']}.rb" if env['MACHINENAME']
-
-      configuration = Bozo::Configuration.new
-
-      default_files.each do |file|
-        path = File.join('config', file)
-        configuration.load path if File.exist? path
-      end
-
-      configuration
-    end
-
-    def default_script
-      <<-SQL
-      IF EXISTS(select * from sys.databases where name='#{@database_name}')
-      BEGIN
-        -- handle when the database cannot be dropped because it is currently in use
-        ALTER DATABASE #{@database_name} SET SINGLE_USER WITH ROLLBACK IMMEDIATE
-
-        DROP DATABASE #{@database_name}
-      END
-      GO
-
-      -- Create DB
-      CREATE DATABASE [#{@database_name}]
-      GO
-      SQL
-    end
-
-  end
-
-end