allen 0.2.0 → 0.3.0

data/lib/allen/asset_bundle.rb

@@ -0,0 +1,43 @@
+module Allen
+  class AssetBundle < Struct.new(:preprocessor, :input, :output)
+    def build
+      Bundler.with_clean_env { preprocessor.build(input, output) }
+    end
+
+    def compress
+      Bundler.with_clean_env { preprocessor.compress(input, output) }
+    end
+
+    def watch
+      Bundler.with_clean_env { preprocessor.watch(input, output) }
+    end
+
+    alias_method :build!, :build
+    alias_method :watch!, :watch
+    alias_method :compress!, :compress
+  end
+
+
+  class AssetBundleCollection < Struct.new(:js_bundle, :css_bundle)
+    def bundles
+      [js_bundle, css_bundle]
+    end
+
+    def build
+      bundles.each(&:build)
+    end
+
+    def compress
+      bundles.each(&:compress)
+    end
+
+    def watch
+      bundles.each(&:watch)
+    end
+
+    alias_method :build!, :build
+    alias_method :watch!, :watch
+    alias_method :compress!, :compress
+  end
+end
+

data/lib/allen/cli.rb

@@ -10,6 +10,7 @@ module Allen
 
     desc "new ClientName", "Initialize an Umbraco project"
     def new(name)
+      @full_name = name
       @name = File.basename(File.expand_path(name)).gsub(/\W/, '_').squeeze('_').camelize
       self.destination_root = File.join(File.dirname(File.expand_path(name)), @name)
 
@@ -27,6 +28,8 @@ module Allen
       template  'README.md.tt'
       template  'Rakefile.tt'
       template  'Gemfile.tt'
+
+      system "git init #{destination_root}"
     end
 
     no_tasks do

data/lib/allen/dsl.rb

@@ -1,5 +1,6 @@
 require 'allen'
 require 'allen/project'
+Dir[File.dirname(__FILE__) + '/projects/*.rb'].each {|file| require file }
 require 'allen/settings'
 
 module Allen
@@ -9,7 +10,10 @@ module Allen
     end
 
     def project(name, &block)
-      project = Allen::Project.new(name, block)
+      settings = Allen.settings.clone
+      settings.configure(block)
+      klass = Allen.const_get (settings.type.to_s + "_project").classify
+      project = klass.new(name, settings)
       Allen.projects << project
       project
     end

data/lib/allen/project.rb

@@ -1,25 +1,66 @@
 require 'allen/settings'
 require 'allen/preprocessors'
+require 'allen/asset_bundle'
 
 module Allen
   class Project
     attr_accessor :name, :settings
 
-    def initialize(name="Umbraco", block=nil)
+    def initialize(name="Umbraco", settings=Allen.settings.clone)
       @name = name
-      @settings = Allen.settings.clone
+      @settings = settings
       @settings.configure do
         name name
       end
-      @settings.configure(block) if block
     end
 
-    def css_preprocessor
-      Preprocessors.for(settings.css_preprocessor)
+    def build!
+      assets.build!
+      generate_meta_data!
     end
 
-    def js_preprocessor
-      Preprocessors.for(settings.js_preprocessor)
+    def install!
     end
+
+    def uninstall!
+    end
+
+    def assets
+      @asset_bundle_collection ||= AssetBundleCollection.new(js, css)
+    end
+
+    def js
+      @js_asset_bundle ||= begin
+        preprocessor = Preprocessors.for(settings.js_preprocessor)
+        input  = "#{settings.src_dir}/#{settings.client}.#{name}/#{settings.js_input}"
+        output = "#{settings.src_dir}/#{settings.client}.#{name}/#{settings.js_output}"
+        AssetBundle.new(preprocessor, input, output)
+      end
+    end
+
+    def css
+      @css_asset_bundle ||= begin
+        preprocessor = Preprocessors.for(settings.css_preprocessor)
+        input  = "#{settings.src_dir}/#{settings.client}.#{name}/#{settings.css_input}"
+        output = "#{settings.src_dir}/#{settings.client}.#{name}/#{settings.css_output}"
+        AssetBundle.new(preprocessor, input, output)
+      end
+    end
+
+  private
+
+    def generate_meta_data!
+      #create a version file with the time and the latest git commit
+      version_file = File.open("#{settings.webroot}/version","w")
+      version_file.puts "built: #{Time.now.to_s}"
+      version_file.puts `git log -1`
+      version_file.close
+
+      #create a commit-hash file with just the last commit hash in it
+      hash_file = File.open("#{settings.webroot}/commit-hash","w")
+      hash_file.print  `git log -1 --format="%H"`.chomp
+      hash_file.close
+    end
+
   end
 end

data/lib/allen/projects/static_project.rb

@@ -0,0 +1,4 @@
+module Allen
+  class StaticProject < Project
+  end
+end

data/lib/allen/projects/umbraco_project.rb

@@ -0,0 +1,24 @@
+module Allen
+  class UmbracoProject < Project
+
+    def install!
+      super
+      packages = Nokogiri::XML(File.read("#{settings.webroot}/packages.config"))
+      umbraco  = packages.xpath("//package[@id='UmbracoCms']")
+
+      package_name    = umbraco.xpath('@id').text
+      package_version = umbraco.xpath('@version').text
+      package_path    = "#{src_dir}/packages/#{package_name}.#{package_version}/UmbracoFiles"
+
+      ['umbraco', 'umbraco_client', 'install'].map do |directory|
+        File.join package_path, directory
+      end.each do |directory|
+        cp_r directory, settings.webroot
+      end
+
+      build!
+    end
+
+  end
+end
+

data/lib/allen/settings.rb

@@ -8,6 +8,7 @@ module Allen
 
       defaults = Proc.new do
         client           "Client"
+        type             :umbraco
         css_input        "assets/stylesheets/app/application.less"
         css_output       "css/application.css"
         css_preprocessor :banshee

data/lib/allen/task_definer.rb

@@ -11,47 +11,21 @@ module Allen
     end
 
     def define_tasks
-      # Default Tasks
       task :default => :build
 
-      # Build Task
       desc "Build the solution in debug mode and compile all assets"
-      task :build => ['assets:build', 'deploy:build'] do
-        Rake.application.invoke_task('solution:msbuild["debug"]')
-      end
-
-      # Release Build
-      desc "Build the solution in release mode, compile and compress all assets"
-      task :release => ['assets:build', 'assets:compress'] do
-        Rake.application.invoke_task('solution:msbuild["release"]')
-      end
+      task :build => ['assets:build', 'solution:msbuild']
 
       namespace :solution do
         desc "Build the solution with a chosen configuration"
-        msbuild :msbuild, :config do |msb, args|
+        msbuild :msbuild do |msb|
           msb.solution   = "#{settings.solution}"
-          msb.properties = { :configuration => args.config.to_sym }
+          msb.properties = { :configuration => :release }
           msb.parameters = settings.parameters
           msb.targets    = settings.targets
         end
       end
 
-      namespace :deploy do
-        desc "Creates files for deployment"
-        task :build do
-          #create a version file with the time and the latest git commit
-          version_file = File.open("#{settings.webroot}/version","w")
-          version_file.puts "built: #{Time.now.to_s}"
-          version_file.puts `git log -1`
-          version_file.close
-
-          #create a commit-hash file with just the last commit hash in it
-          hash_file = File.open("#{settings.webroot}/commit-hash","w")
-          hash_file.print  `git log -1 --format="%H"`.chomp
-          hash_file.close
-        end
-      end
-
       namespace :assets do
         desc "Watches assets for every project"
         multitask :watch => projects.map { |project| "#{project.name.downcase}:assets:watch" }
@@ -66,16 +40,13 @@ module Allen
       projects.each do |project|
         namespace project.name.downcase do
           desc "Build the #{project.name} project in debug mode and compile assets"
-          task :build => ['assets:build'] do
-            Rake.application.invoke_task(project.name.downcase + ':msbuild["debug"]')
+          task :build do
+            project.build!
           end
 
-          desc "Build the #{project.name} project in debug mode"
-          msbuild :msbuild, :config do |msb, args|
-            msb.solution   = "#{project.settings.src_dir}/#{project.settings.client}.#{project.name}/#{project.settings.client}.#{project.name}.csproj"
-            msb.properties = { :configuration => args.config.to_sym }
-            msb.parameters = project.settings.parameters
-            msb.targets    = project.settings.targets
+          desc "Install dependencies for the #{project.name} project"
+          task :install do
+            project.install!
           end
 
           namespace :assets do
@@ -91,39 +62,35 @@ module Allen
 
           namespace :css do
             desc "Builds CSS for the #{project.name} project"
-            input  = "#{project.settings.src_dir}/#{project.settings.client}.#{project.name}/#{project.settings.css_input}"
-            output = "#{project.settings.src_dir}/#{project.settings.client}.#{project.name}/#{project.settings.css_output}"
-            preprocessor = project.css_preprocessor
-
             task :build do
-              Bundler.with_clean_env { preprocessor.build(input, output) }
+              project.css.build!
             end
 
+            desc "Compresses CSS for the #{project.name} project"
             task :compress do
-              Bundler.with_clean_env { preprocessor.compress(input, output) }
+              project.css.compress!
             end
 
+            desc "Watches CSS for the #{project.name} project"
             task :watch do
-              Bundler.with_clean_env { preprocessor.watch(input, output) }
+              project.css.watch!
             end
           end
 
           namespace :js do
             desc "Builds JS for the #{project.name} project"
-            input  = "#{project.settings.src_dir}/#{project.settings.client}.#{project.name}/#{project.settings.js_input}"
-            output = "#{project.settings.src_dir}/#{project.settings.client}.#{project.name}/#{project.settings.js_output}"
-            preprocessor = project.js_preprocessor
-
             task :build do
-              Bundler.with_clean_env { preprocessor.build(input, output) }
+              project.js.build!
             end
 
+            desc "Compresses JS for the #{project.name} project"
             task :compress do
-              Bundler.with_clean_env { preprocessor.compress(input, output) }
+              project.js.compress!
             end
 
+            desc "Watches JS for the #{project.name} project"
             task :watch do
-              Bundler.with_clean_env { preprocessor.watch(input, output) }
+              project.js.watch!
             end
           end
         end
@@ -131,4 +98,3 @@ module Allen
     end
   end
 end
-

data/lib/allen/version.rb

@@ -1,3 +1,3 @@
 module Allen
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/lib/allen/dsl_spec.rb

@@ -33,5 +33,19 @@ describe Allen::DSL do
     proj1.settings.cache.should == false
     proj2.settings.compressor.should == :uglify
   end
+
+  it "assumes the project is an UmbracoProject" do
+    proj1 = project "Ralphy"
+    proj1.settings.type.should == :umbraco
+    proj1.class.should == Allen::UmbracoProject
+  end
+
+  it "can have a type other than umbraco" do
+    proj1 = project "Ralphy" do
+      type :static
+    end
+    proj1.settings.type.should == :static
+    proj1.class.should == Allen::StaticProject
+  end
 end
 

data/spec/lib/allen/project_spec.rb

@@ -33,46 +33,46 @@ describe Allen::Project do
     it "knows its css preprocessor" do
       project = Allen::Project.new
       project.settings.css_preprocessor :coyote
-      project.css_preprocessor.should == Allen::Preprocessors::Coyote
+      project.css.preprocessor.should == Allen::Preprocessors::Coyote
     end
 
     it "knows about sass" do
       project = Allen::Project.new
       project.settings.css_preprocessor :sass
-      project.css_preprocessor.should == Allen::Preprocessors::Sass
+      project.css.preprocessor.should == Allen::Preprocessors::Sass
     end
 
     it "knows about banshee" do
       project = Allen::Project.new
       project.settings.css_preprocessor :banshee
-      project.css_preprocessor.should == Allen::Preprocessors::Banshee
+      project.css.preprocessor.should == Allen::Preprocessors::Banshee
     end
 
     it "raises when it doesn't know the css preprocessor" do
       project = Allen::Project.new
       project.settings.css_preprocessor :pawikwkasdf
       expect {
-        project.css_preprocessor
+        project.css.preprocessor
       }.to raise_error StandardError, /unknown preprocessor: pawikwkasdf/
     end
 
     it "knows its js preprocessor" do
       project = Allen::Project.new
       project.settings.js_preprocessor :coyote
-      project.js_preprocessor.should == Allen::Preprocessors::Coyote
+      project.js.preprocessor.should == Allen::Preprocessors::Coyote
     end
 
     it "knows about banshee" do
       project = Allen::Project.new
       project.settings.js_preprocessor :banshee
-      project.js_preprocessor.should == Allen::Preprocessors::Banshee
+      project.js.preprocessor.should == Allen::Preprocessors::Banshee
     end
 
     it "raises when it doesn't know the js preprocessor" do
       project = Allen::Project.new
       project.settings.js_preprocessor :fsdfasdfadsf
       expect {
-        project.js_preprocessor
+        project.js.preprocessor
       }.to raise_error StandardError, /unknown preprocessor: fsdfasdfadsf/
     end
   end

data/templates/.gitignore

@@ -66,6 +66,9 @@ src/*.Umbraco/App_Data/umbraco.config
 src/*.Umbraco/aspnet_client/
 src/*.Umbraco/media/
 src/*.Umbraco/imagecache/
+src/*.Umbraco/install/
+src/*.Umbraco/umbraco/
+src/*.Umbraco/umbraco_client/
 
 *[Rr]e[Ss]harper.user
 _ReSharper.*/

data/templates/README.md.tt

@@ -1,4 +1,4 @@
-# <%= @name %>
+# <%= @full_name %>
 
 ---
 

data/templates/Rakefile.tt

@@ -11,8 +11,6 @@ end
 
 settings do
   client "<%= @name %>"
-  css_preprocessor :banshee
-  js_preprocessor :banshee
 end
 
 project "Umbraco"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: allen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -191,10 +191,13 @@ files:
 - allen.gemspec
 - bin/allen
 - lib/allen.rb
+- lib/allen/asset_bundle.rb
 - lib/allen/cli.rb
 - lib/allen/dsl.rb
 - lib/allen/preprocessors.rb
 - lib/allen/project.rb
+- lib/allen/projects/static_project.rb
+- lib/allen/projects/umbraco_project.rb
 - lib/allen/rake.rb
 - lib/allen/settings.rb
 - lib/allen/task_definer.rb