railsthemes 1.1.2 → 1.2.0

data/lib/railsthemes.rb

@@ -15,6 +15,7 @@ require 'railsthemes/tar'
 require 'railsthemes/installer'
 require 'railsthemes/theme_installer'
 require 'railsthemes/email_installer'
+require 'railsthemes/asset_installer'
 require 'railsthemes/ensurer'
 
 module Railsthemes

data/lib/railsthemes/asset_installer.rb

@@ -0,0 +1,48 @@
+module Railsthemes
+  class AssetInstaller < Thor
+    no_tasks do
+      include Railsthemes::Logging
+      include Thor::Actions
+
+      def install_from_file_system original_source_filepath
+        logger.warn 'Installing design assets...'
+        source_filepath = original_source_filepath.gsub(/\\/, '/')
+        logger.info "Source filepath: #{source_filepath}"
+
+        if File.directory?(source_filepath)
+          install_from_directory source_filepath
+        elsif Utils.archive?(source_filepath + '.tar.gz')
+          install_from_archive source_filepath + '.tar.gz'
+        end
+      end
+
+      def install_from_directory source_filepath
+        Dir["#{source_filepath}/design-assets/**/*"].each do |src|
+          logger.debug "src: #{src}"
+          dest = src.sub("#{source_filepath}/design-assets/", '')
+          logger.debug "dest: #{dest}"
+          if File.directory?(src)
+            unless File.directory?(dest)
+              logger.debug "mkdir -p #{dest}"
+              FileUtils.mkdir_p(dest)
+            end
+          else
+            unless src =~ /\/\./ # remove any pesky hidden files that crept into the archive
+              logger.debug "cp #{src} #{dest}"
+              FileUtils.cp(src, dest)
+            end
+          end
+        end
+
+        logger.warn 'Done installing design assets.'
+      end
+
+      def install_from_archive filepath
+        Railsthemes::Utils.with_tempdir do |tempdir|
+          Utils.unarchive filepath, tempdir
+          install_from_file_system tempdir
+        end
+      end
+    end
+  end
+end

data/lib/railsthemes/email_installer.rb

@@ -5,8 +5,8 @@ module Railsthemes
       include Thor::Actions
 
       def install_from_file_system original_source_filepath
-        source_filepath = original_source_filepath.gsub(/\\/, '/')
         logger.warn 'Installing email theme...'
+        source_filepath = original_source_filepath.gsub(/\\/, '/')
         logger.info "Source filepath: #{source_filepath}"
 
         if File.directory?(source_filepath)

data/lib/railsthemes/installer.rb

@@ -23,6 +23,11 @@ module Railsthemes
         @email_installer ||= EmailInstaller.new
       end
 
+      # can probably just make static
+      def asset_installer
+        @asset_installer ||= AssetInstaller.new
+      end
+
       def popup_documentation
         style_guides = Dir['doc/*Usage_And_Style_Guide.html']
         # need better tests of popping up multiple docs
@@ -49,8 +54,13 @@ module Railsthemes
         if File.directory?(filepath) || Utils.archive?(filepath + '.tar.gz')
           email_installer.install_from_file_system filepath
           @installed_email = true
-        else
-          # no email to install... moving along
+        end
+
+        # install design assets if present
+        filepath = File.join(original_source_filepath, 'design-assets')
+        if File.directory?(filepath) || Utils.archive?(filepath + '.tar.gz')
+          asset_installer.install_from_file_system filepath
+          @installed_assets = true
         end
 
         print_post_installation_instructions
@@ -66,7 +76,7 @@ module Railsthemes
         dl_hash = get_download_hash code
 
         if dl_hash
-          logger.debug "dl_hash: #{dl_hash.to_s}"
+          logger.debug "dl_hash: #{dl_hash.inspect}"
           Utils.with_tempdir do |tempdir|
             download_from_hash dl_hash, tempdir
             install_from_file_system tempdir
@@ -114,6 +124,14 @@ module Railsthemes
           Utils.download :url => url, :save_to => archive
           logger.warn "Done downloading email theme."
         end
+
+        url = dl_hash['design_assets']
+        if url
+          logger.warn "Downloading design assets..."
+          archive = File.join(download_to, 'design-assets.tar.gz')
+          Utils.download :url => url, :save_to => archive
+          logger.warn "Done downloading design assets."
+        end
       end
 
       def send_gemfile code

data/lib/railsthemes/version.rb

@@ -1,5 +1,5 @@
 module Railsthemes
   unless defined?(Railsthemes::VERSION)
-    VERSION = "1.1.2"
+    VERSION = "1.2.0"
   end
 end

data/spec/lib/railsthemes/asset_installer_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'railsthemes'
+
+describe Railsthemes::AssetInstaller do
+  #before do
+  #  setup_logger
+  #  @installer = Railsthemes::AssetInstaller.new
+  #  @tempdir = stub_tempdir
+  #end
+end

data/spec/lib/railsthemes/installer_spec.rb

@@ -20,6 +20,7 @@ describe Railsthemes::Installer do
     describe 'installing theme' do
       before do
         stub(@installer.email_installer).install_from_file_system(anything)
+        stub(@installer.asset_installer).install_from_file_system(anything)
       end
 
       it 'should install the right theme version' do
@@ -29,7 +30,6 @@ describe Railsthemes::Installer do
 
       it 'should install the right theme version if it is an archive in that directory' do
         mock(@installer.theme_installer).install_from_file_system('spec/fixtures/blank-assets-archived/erb-css')
-        stub(@installer.email_installer).install_from_file_system(anything)
         @installer.install_from_file_system 'spec/fixtures/blank-assets-archived'
       end
     end
@@ -37,6 +37,7 @@ describe Railsthemes::Installer do
     describe 'installing email theme' do
       before do
         stub(@installer.theme_installer).install_from_file_system(anything)
+        stub(@installer.asset_installer).install_from_file_system(anything)
       end
 
       it 'should install the email theme if present' do
@@ -49,6 +50,23 @@ describe Railsthemes::Installer do
         @installer.install_from_file_system 'spec/fixtures/blank-assets-archived'
       end
     end
+
+    describe 'installing design assets theme' do
+      before do
+        stub(@installer.theme_installer).install_from_file_system(anything)
+        stub(@installer.email_installer).install_from_file_system(anything)
+      end
+
+      it 'should install the design assets if present' do
+        mock(@installer.asset_installer).install_from_file_system('spec/fixtures/blank-assets/design-assets')
+        @installer.install_from_file_system 'spec/fixtures/blank-assets'
+      end
+
+      it 'should install the archived design assets if present' do
+        mock(@installer.asset_installer).install_from_file_system('spec/fixtures/blank-assets-archived/design-assets')
+        @installer.install_from_file_system 'spec/fixtures/blank-assets-archived'
+      end
+    end
   end
 
   # should probably move documentation stuff to another class
@@ -98,6 +116,11 @@ describe Railsthemes::Installer do
       mock(Railsthemes::Utils).download(:url => 'email_url', :save_to => "dir/email.tar.gz")
       @installer.download_from_hash({'email' => 'email_url'}, 'dir')
     end
+
+    it 'should download and install design assets when that is specified' do
+      mock(Railsthemes::Utils).download(:url => 'asset_url', :save_to => "dir/design-assets.tar.gz")
+      @installer.download_from_hash({'design_assets' => 'asset_url'}, 'dir')
+    end
   end
 
   describe '#install_from_code' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railsthemes
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Railsthemes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-14 00:00:00 Z
+date: 2012-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -94,6 +94,7 @@ files:
 - bin/railsthemes
 - cacert.pem
 - lib/railsthemes.rb
+- lib/railsthemes/asset_installer.rb
 - lib/railsthemes/email_installer.rb
 - lib/railsthemes/ensurer.rb
 - lib/railsthemes/installer.rb
@@ -105,6 +106,7 @@ files:
 - lib/railsthemes/utils.rb
 - lib/railsthemes/version.rb
 - railsthemes.gemspec
+- spec/fixtures/blank-assets-archived/design-assets.tar.gz
 - spec/fixtures/blank-assets-archived/email.tar.gz
 - spec/fixtures/blank-assets-archived/erb-css.tar.gz
 - spec/fixtures/blank-assets/email/app/assets/stylesheets/email.css
@@ -118,6 +120,7 @@ files:
 - spec/fixtures/blank-assets/erb-css/base/app/views/layouts/homepage.html.erb
 - spec/fixtures/blank-assets/erb-css/gems/formtastic/app/assets/stylesheets/formtastic.css.scss
 - spec/fixtures/blank-assets/erb-css/gems/simple_form/app/assets/stylesheets/simple_form.css.scss
+- spec/lib/railsthemes/asset_installer_spec.rb
 - spec/lib/railsthemes/email_installer_spec.rb
 - spec/lib/railsthemes/ensurer_spec.rb
 - spec/lib/railsthemes/installer_spec.rb
@@ -158,6 +161,7 @@ signing_key:
 specification_version: 3
 summary: Installs gems from railsthemes.com
 test_files: 
+- spec/fixtures/blank-assets-archived/design-assets.tar.gz
 - spec/fixtures/blank-assets-archived/email.tar.gz
 - spec/fixtures/blank-assets-archived/erb-css.tar.gz
 - spec/fixtures/blank-assets/email/app/assets/stylesheets/email.css
@@ -171,6 +175,7 @@ test_files:
 - spec/fixtures/blank-assets/erb-css/base/app/views/layouts/homepage.html.erb
 - spec/fixtures/blank-assets/erb-css/gems/formtastic/app/assets/stylesheets/formtastic.css.scss
 - spec/fixtures/blank-assets/erb-css/gems/simple_form/app/assets/stylesheets/simple_form.css.scss
+- spec/lib/railsthemes/asset_installer_spec.rb
 - spec/lib/railsthemes/email_installer_spec.rb
 - spec/lib/railsthemes/ensurer_spec.rb
 - spec/lib/railsthemes/installer_spec.rb