plasmoid 0.0.2 → 0.0.3

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "jeweler"
+gem "jeweler", "1.6.0"
 
 # Add dependencies required to use your gem here.
 # Example:

data/Gemfile.lock

@@ -2,18 +2,15 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
-    jeweler (1.5.1)
+    jeweler (1.6.0)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
+    rake (0.9.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  jeweler
-
-METADATA
-  version: 1.0.6
+  jeweler (= 1.6.0)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/plasmoid

@@ -3,6 +3,6 @@
 $:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'rubygems'
-require 'plasmoid/generator'
+require 'plasmoid'
 
 exit Plasmoid::Generator.run!(*ARGV)

data/lib/plasmoid.rb

@@ -0,0 +1,4 @@
+require 'plasmoid/generator'
+require 'plasmoid/webkit_generator'
+require 'plasmoid/ruby_generator'
+

data/lib/plasmoid/generator.rb

@@ -35,7 +35,7 @@ module Plasmoid
     end
 
     def self.run!(*args)
-      options = Plasmoid::Generator::Options.new(args)
+      options = self::Options.new(args)
 
       if options[:invalid_argument]
         $stderr.puts options[:invalid_argument]
@@ -52,7 +52,7 @@ module Plasmoid
         return 1
       end
 
-      generator = Plasmoid::Generator.new(options)
+      generator = options[:generator].new(options)
       generator.run
       return 0
     end
@@ -63,34 +63,6 @@ module Plasmoid
       $stdout.puts "Your plasmoid is ready at #{target_dir}\ntype `rake -T` to see the available actions"
     end
 
-    private
-    def create_files
-      puts "Creating files in #{target_dir}"
-      FileUtils.mkpath(target_dir)
-
-      Find.find(template_dir) do |path|
-        dest = path.sub(template_dir, "")
-
-        next if path =~ /^\.+$/ || dest.empty? || path =~ /~$/
-        if File.directory?(path)
-          mkdir(dest)
-        else
-          write_template(dest, dest)
-        end
-      end
-
-      if options[:use_haml]
-        Dir.chdir(target_dir) do
-          Dir.glob(File.join("contents/**/**/*.html")) do |path|
-            dest = path + ".haml"
-            puts dest
-            system("html2haml '#{path}' '#{dest}'")
-            File.unlink path
-          end
-        end
-      end
-    end
-
     def create_version_control
       Dir.chdir(target_dir) do
         begin
@@ -108,7 +80,6 @@ module Plasmoid
         begin
           @repo.commit "Initial commit to #{project_name}."
         rescue Git::GitExecuteError => e
-          raise
         end
       end
     end

data/lib/plasmoid/generator/options.rb

@@ -8,6 +8,8 @@ module Plasmoid
       def initialize(args)
         super()
 
+        self[:generator] = Plasmoid::WebkitGenerator
+
         @argv = args.clone
         @parser = OptionParser.new do |o|
           o.banner = "Usage: #{File.basename($0)} [options] name\ne.g. #{File.basename($0)} weba"
@@ -16,7 +18,15 @@ module Plasmoid
             self[:directory] = directory
           end
 
-          o.separator ""
+          o.on("--ruby", "generate ruby plasmoid") do |o|
+            self[:generator] = Plasmoid::RubyGenerator
+          end
+
+          o.separator "Webkit Options:"
+
+          o.on("--webkit", "generate webkit plasmoid") do |o|
+            self[:generator] = Plasmoid::WebkitGenerator
+          end
 
           o.on('--haml', 'enable haml') do |o|
             self[:use_haml] = true

data/lib/plasmoid/generator/template_helper.rb

@@ -7,7 +7,15 @@ module Plasmoid
       end
 
       def template_dir
-        @template_dir ||= File.join(File.dirname(__FILE__), 'templates')
+        @template_dir ||= File.join(File.dirname(__FILE__), 'templates', prefix_dir)
+      end
+
+      def prefix_dir
+        if self.class == Plasmoid::WebkitGenerator
+          "webkit"
+        elsif self.class == Plasmoid::RubyGenerator
+          "ruby"
+        end
       end
 
       def render_template(source)

data/lib/plasmoid/generator/templates/ruby/contents/code/main.rb

@@ -0,0 +1,34 @@
+require 'plasma_applet'
+
+Qt::WebSettings::globalSettings.setAttribute(Qt::WebSettings::PluginsEnabled, true)
+Qt::WebSettings::globalSettings.setAttribute(Qt::WebSettings::JavascriptEnabled, true)
+
+module <%= options[:project_name].capitalize %>
+  class Main < PlasmaScripting::Applet
+    def initialize(parent)
+      super parent
+    end
+
+    private
+    
+    def init
+      self.has_configuration_interface = false
+      self.aspect_ratio_mode = Plasma::IgnoreAspectRatio
+
+      resize 380, 500
+      
+      @layout = Qt::GraphicsLinearLayout.new Qt::Vertical, self
+      self.layout = @layout
+
+      @web_page = Plasma::WebView.new(self)
+
+      #set white BG to ignore system palette
+      @web_page.page.setPalette Qt::Palette.new(Qt::Color.new 255,255,255)	
+      @layout.add_item @web_page
+
+      @web_page.url = KDE::Url.new("http://www.kde.org")
+    end
+
+    public
+  end
+end

data/lib/plasmoid/generator/templates/ruby/metadata.desktop

@@ -0,0 +1,19 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=<%= options[:project_name] %>
+Name[nl]=<%= options[:project_name] %>
+Type=Service
+ServiceTypes=Plasma/Applet
+Icon=chronometer
+X-Plasma-API=ruby-script
+X-Plasma-MainScript=code/main.rb
+X-KDE-PluginInfo-Author=<%= options[:user_name] %>
+X-KDE-PluginInfo-Email=<%= options[:project_email] %>
+X-KDE-PluginInfo-Name=<%= options[:project_name] %>
+X-KDE-PluginInfo-Version=1.0
+X-KDE-PluginInfo-Website=http://plasma.kde.org/
+X-KDE-PluginInfo-Category=Web Based
+X-KDE-PluginInfo-Depends=
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true
+X-Plasma-DefaultSize=380,500

data/lib/plasmoid/generator/templates/webkit/Rakefile

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'plasmoid'
+require 'plasmoid/tasks'

data/lib/plasmoid/ruby_generator.rb

@@ -0,0 +1,19 @@
+module Plasmoid
+  class RubyGenerator < Generator
+    def create_files
+      puts "Creating files in #{target_dir}"
+      FileUtils.mkpath(target_dir)
+
+      Find.find(template_dir) do |path|
+        dest = path.sub(template_dir, "")
+
+        next if path =~ /^\.+$/ || dest.empty? || path =~ /~$/
+        if File.directory?(path)
+          mkdir(dest)
+        else
+          write_template(dest, dest)
+        end
+      end
+    end
+  end
+end

data/lib/plasmoid/webkit_generator.rb

@@ -0,0 +1,30 @@
+module Plasmoid
+  class WebkitGenerator < Generator
+    def create_files
+      puts "Creating files in #{target_dir}"
+      FileUtils.mkpath(target_dir)
+
+      Find.find(template_dir) do |path|
+        dest = path.sub(template_dir, "")
+
+        next if path =~ /^\.+$/ || dest.empty? || path =~ /~$/
+        if File.directory?(path)
+          mkdir(dest)
+        else
+          write_template(dest, dest)
+        end
+      end
+
+      if options[:use_haml]
+        Dir.chdir(target_dir) do
+          Dir.glob(File.join("contents/**/**/*.html")) do |path|
+            dest = path + ".haml"
+            puts dest
+            system("html2haml '#{path}' '#{dest}'")
+            File.unlink path
+          end
+        end
+      end
+    end
+  end
+end

data/plasmoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{plasmoid}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = %q{2010-12-01}
+  s.date = %q{2011-06-04}
   s.default_executable = %q{plasmoid}
   s.description = %q{ruby gem to build and work with KDE plasmoids}
   s.email = %q{krawek@gmail.com}
@@ -33,14 +33,19 @@ Gem::Specification.new do |s|
     "lib/plasmoid/generator.rb",
     "lib/plasmoid/generator/options.rb",
     "lib/plasmoid/generator/template_helper.rb",
-    "lib/plasmoid/generator/templates/Rakefile",
-    "lib/plasmoid/generator/templates/contents/code/application.js",
-    "lib/plasmoid/generator/templates/contents/code/main.html",
-    "lib/plasmoid/generator/templates/contents/code/style.css",
-    "lib/plasmoid/generator/templates/metadata.desktop",
+    "lib/plasmoid/generator/templates/ruby/Rakefile",
+    "lib/plasmoid/generator/templates/ruby/contents/code/main.rb",
+    "lib/plasmoid/generator/templates/ruby/metadata.desktop",
+    "lib/plasmoid/generator/templates/webkit/Rakefile",
+    "lib/plasmoid/generator/templates/webkit/contents/code/application.js",
+    "lib/plasmoid/generator/templates/webkit/contents/code/main.html",
+    "lib/plasmoid/generator/templates/webkit/contents/code/style.css",
+    "lib/plasmoid/generator/templates/webkit/metadata.desktop",
     "lib/plasmoid/haml.rb",
     "lib/plasmoid/package.rb",
+    "lib/plasmoid/ruby_generator.rb",
     "lib/plasmoid/tasks.rb",
+    "lib/plasmoid/webkit_generator.rb",
     "plasmoid.gemspec",
     "spec/plasmoid_spec.rb",
     "spec/spec_helper.rb"
@@ -50,24 +55,20 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{ruby gem to work with KDE plasmoids}
-  s.test_files = [
-    "spec/plasmoid_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, ["= 1.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
     else
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["= 1.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     end
   else
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["= 1.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: plasmoid
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -15,39 +14,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -05:00
+date: 2011-06-04 00:00:00 -05:00
 default_executable: plasmoid
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: jeweler
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 1
+        - 6
         - 0
-        version: "0"
-  requirement: *id001
-  prerelease: false
+        version: 1.6.0
   type: :runtime
-  name: jeweler
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: bundler
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  requirement: *id002
-  prerelease: false
   type: :development
-  name: bundler
+  prerelease: false
+  version_requirements: *id002
 description: ruby gem to build and work with KDE plasmoids
 email: krawek@gmail.com
 executables: 
@@ -72,14 +71,19 @@ files:
 - lib/plasmoid/generator.rb
 - lib/plasmoid/generator/options.rb
 - lib/plasmoid/generator/template_helper.rb
-- lib/plasmoid/generator/templates/Rakefile
-- lib/plasmoid/generator/templates/contents/code/application.js
-- lib/plasmoid/generator/templates/contents/code/main.html
-- lib/plasmoid/generator/templates/contents/code/style.css
-- lib/plasmoid/generator/templates/metadata.desktop
+- lib/plasmoid/generator/templates/ruby/Rakefile
+- lib/plasmoid/generator/templates/ruby/contents/code/main.rb
+- lib/plasmoid/generator/templates/ruby/metadata.desktop
+- lib/plasmoid/generator/templates/webkit/Rakefile
+- lib/plasmoid/generator/templates/webkit/contents/code/application.js
+- lib/plasmoid/generator/templates/webkit/contents/code/main.html
+- lib/plasmoid/generator/templates/webkit/contents/code/style.css
+- lib/plasmoid/generator/templates/webkit/metadata.desktop
 - lib/plasmoid/haml.rb
 - lib/plasmoid/package.rb
+- lib/plasmoid/ruby_generator.rb
 - lib/plasmoid/tasks.rb
+- lib/plasmoid/webkit_generator.rb
 - plasmoid.gemspec
 - spec/plasmoid_spec.rb
 - spec/spec_helper.rb
@@ -97,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -805994551903766880
       segments: 
       - 0
       version: "0"
@@ -106,7 +110,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -117,6 +120,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ruby gem to work with KDE plasmoids
-test_files: 
-- spec/plasmoid_spec.rb
-- spec/spec_helper.rb
+test_files: []
+