spiderfw 0.6.13 → 0.6.14

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 0.6.14
+== 4 August, 2011
+* Installer and Windows fixes
+
 = 0.6.13
 == 3 August, 2011
 * Fixed bug in configuration editor

data/VERSION

@@ -1 +1 @@
-0.6.13
+0.6.14

data/lib/spiderfw/app.rb

@@ -333,12 +333,18 @@ END_OF_EVAL
                 end
                 spec
             end
-            
-            def load_after(*vals)
-                @load_after = vals unless vals.empty?
-                unless @load_after
-                    return self.depends + self.depends_optional
-                end
+
+            def get_runtime_dependencies
+                return self.load_after if @load_after
+                return self.depends + self.depends_optional
+            end
+
+            def gems_list
+                self.gems.map{ |g| g.is_a?(Array) ? g.first : g }
+            end
+
+            def gems_optional_list
+                self.gems_optional.map{ |g| g.is_a?(Array) ? g.first : g }
             end
 
         end
@@ -365,8 +371,7 @@ END_OF_EVAL
             
             def tsort_each_child(node, &block)
                 return unless node.is_a?(AppSpec)
-                return unless node.load_after
-                node.load_after.map{ |a| @apps_hash[a] }.each(&block)
+                node.get_runtime_dependencies.map{ |a| @apps_hash[a] }.each(&block)
             end
             
             def tsort

data/lib/spiderfw/cmd/commands/app.rb

@@ -111,7 +111,7 @@ class AppCommand < CmdParse::Command
                 @no_deps = true 
             }
             opt.on("--no-gems", _("Don't install ruby gems this app depends on"), "-g"){ |g| @no_gems = true }
-            opt.on("--no-optional", _("Don't install optional app dependencies"), "-D"){ |o| @no_optional = true }
+            opt.on("--optional", _("Install optional app dependencies"), "-o"){ |o| @optional = true }
             opt.on("--no-optional-gems", _("Don't install optional gem dependencies"), "-G"){ |g| 
                 @no_optional_gems = true
             }
@@ -125,7 +125,7 @@ class AppCommand < CmdParse::Command
             end
             require 'spiderfw/setup/app_manager'
             options = {
-                :git => @git, :all => @all, :no_deps => @no_deps, :no_optional => @no_optional, 
+                :git => @git, :all => @all, :no_deps => @no_deps, :optional => @optional, 
                 :no_gems => @no_gems, :no_optional_gems => @no_optional_gems, :no_activate => @no_activate
             }
             options[:url] = @server_url if @server_url

data/lib/spiderfw/config/configuration.rb

@@ -68,7 +68,7 @@ module Spider
         end
         
         def translate_key(key)
-            if (!@options[key])
+            if (!@options[key] && key != 'locale')
                 locale = Spider.locale
                 locale = $1 if locale =~ /^([^@\.]+)[@\.].+/
                 a = @@lang_aliases[locale][key] if @@lang_aliases[locale]

data/lib/spiderfw/setup/app_manager.rb

@@ -36,7 +36,7 @@ module Spider
                 begin
                     require 'git'
                     use_git = true
-                rescue => exc
+                rescue LoadError => exc
                     Spider.output exc.message, :ERROR
                     Spider.output "git gem not available; install git gem for Git support", :ERROR
                 end
@@ -61,7 +61,7 @@ module Spider
             if options[:no_deps]
                 specs = client.get_specs(apps)
             else
-                specs = client.get_deps(apps, :no_optional => options[:no_optional])
+                specs = client.get_deps(apps, :no_optional => !options[:optional])
             end
             deps = specs.map{ |s| s.app_id }
             unless (deps - apps).empty?
@@ -90,15 +90,6 @@ module Spider
             require 'spiderfw/setup/app_server_client'
             Spider.init_base
             url = options[:url] || Spider.conf.get('app_server.url')
-            use_git = false
-            unless options[:no_git]
-                begin
-                    require 'git'
-                    use_git = true
-                rescue
-                    Spider.output "git gem not available; install git gem for Git support"
-                end
-            end
             if options[:all]
                 require 'spiderfw/home'
                 home = Spider::Home.new(Dir.pwd)
@@ -121,7 +112,7 @@ module Spider
                 Spider.output((deps - apps).inspect)
             end
             Spider::AppManager.update(specs, Dir.pwd, {
-                :use_git => use_git, 
+                :use_git => !options[:no_git], 
                 :no_gems => options[:no_gems],
                 :no_optional_gems => options[:no_optional_gems]
             })
@@ -190,10 +181,13 @@ module Spider
             if File.directory?(File.join(home_path, '.git'))
                 begin
                     require 'git'
+                rescue LoadError
+                end
+                begin
                     repo = Git.open(home_path)
                     repo.add("apps/#{spec.id}")
                     repo.commit(_("Added app %s") % spec.id)
-                rescue
+                rescue => exc
                 end
             end
         end
@@ -203,10 +197,7 @@ module Spider
             require 'rubygems/command.rb'
             require 'rubygems/dependency_installer.rb'
             unless options[:no_gems]
-               gems = specs.map{ |s| s.gems }
-               # unless options[:no_optional_gems]
-               #     gems += specs.map{ |s| s.gems_optional }
-               # end
+               gems = specs.map{ |s| s.gems_list }
                gems = gems.flatten.uniq
                gems.reject!{ |g| Spider.gem_available?(g) }
                unless gems.empty?
@@ -217,6 +208,24 @@ module Spider
                         inst.install g
                     end
                 end
+                unless options[:no_optional_gems]
+                    gems = specs.map{ |s| s.gems_optional_list }
+                    gems = gems.flatten.uniq
+                    gems.reject!{ |g| Spider.gem_available?(g) }
+                    unless gems.empty?
+                        Spider.output _("Installing the following optional gems:")
+                        Spider.output gems.inspect
+                        inst = Gem::DependencyInstaller.new
+                        gems.each do |g|
+                            begin
+                                inst.install g
+                            rescue => exc
+                                Spider.output _("Unable to install optional gem %s:") % g
+                                Spider.output exc, :ERROR
+                            end
+                        end
+                    end
+               end
                 # unless Spider.gem_available?('bundler')
                 #     puts _("Installing bundler gem")
                 #     inst = Gem::DependencyInstaller.new
@@ -237,12 +246,23 @@ module Spider
             specs = [specs] unless specs.is_a?(Array)
             pre_setup(specs, options)
             pre_update(specs, options)
+            git_available = nil
             specs.each do |spec|
                 use_git = false
                 if spec.git_repo && options[:use_git]
                     app_path = File.join(home_path, "apps/#{spec.id}")
                     use_git = true if File.directory?(File.join(app_path, '.git'))
                 end
+                use_git = false if git_available == false
+                if use_git && git_available.nil?
+                    begin
+                        require 'git'
+                        use_git = true
+                    rescue LoadError => exc
+                        Spider.output "git gem not available; install git gem for Git support"
+                        use_git = false
+                    end
+                end
                 if use_git
                     git_update(spec, home_path, options)
                 else
@@ -288,9 +308,11 @@ module Spider
             FileUtils.mv(app_path, tmp_app_path)
             begin
                 pack_install(spec, home_path)
-                FileUtils.rmdir(tmp_app_path)
-            rescue
+                FileUtils.rm_rf(tmp_app_path)
+            rescue => exc
                 Spider.output _("Update of %s failed") % spec.id, :ERROR
+                Spider.output exc, :ERROR
+                FileUtils.rm_rf(app_path)
                 FileUtils.mv(tmp_app_path, app_path)
             end
         end

data/lib/spiderfw/spider.rb

@@ -98,6 +98,9 @@ module Spider
         end
         
         def init_base(force=false)
+            l = Spider.locale.to_s
+            l = $1 if l =~ /(\w\w)_+/
+            FastGettext.locale = l
             return if @init_base_done && !force
             
             @apps_to_load = []
@@ -774,7 +777,15 @@ module Spider
         end
         
         def locale
-            Locale.current[0]
+            c_l = Spider.conf.get('locale')
+            return c_l if c_l
+            begin
+                @current_locale = Locale.current[0]
+            rescue
+                # There are problems with subsequent requests on Windows, 
+                # so use cached locale if Locale.current fails
+                @current_locale || 'en'
+            end
         end
         
         def i18n(l = self.locale)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 13
-  version: 0.6.13
+  - 14
+  version: 0.6.14
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 +02:00
+date: 2011-08-04 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency