yast-rake 0.1.2 → 0.1.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a09aae6b96cc31e9d1d23afd7920fe9e5072675b
+  data.tar.gz: 259e3bbf9a822b87990672b34d827c1e2f04afd2
+SHA512:
+  metadata.gz: c53b13f02b671e21405c6f16985ab212d533a4695842cff79ef37f5e42c264028b13017fd560375089c76739499625792f97621266d32898872089dfa751af63
+  data.tar.gz: 549108747e776479965523e872f0062201a5eb6a5bd964ff70f3638ffaf0b37b96878e48e90833addb0f3b2db9645491e0cce24ce3cb899430084dcd49135785

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.5

data/lib/tasks/run.rake

@@ -21,23 +21,24 @@ def set_y2dir
 end
 
 desc "Run given client"
-task :run, :client do |t,args|
+task :run, :client do |t, args|
   args.with_defaults = { :client => nil }
-  if args[:client]
-    args[:client] = Dir["**/src/clients/#{args[:client]}.rb"].first
+  client = args[:client]
+  if client
+    client = Dir["**/src/clients/#{client}.rb"].first
   else
     clients = Dir["**/src/clients/*.rb"]
-    args[:client] = clients.reduce do |min, n|
+    client = clients.reduce do |min, n|
       next n if min.nil?
       # use client with shortest name by default
       min.size > n.size ? n : min
     end
   end
 
-  raise "No client found" unless args[:client]
+  raise "No client found" unless client
 
   set_y2dir
-  sh "/sbin/yast2 #{args[:client]}"
+  sh "/sbin/yast2 #{client}"
 end
 
 desc "Runs console with preloaded module directories"

data/lib/tasks/test_unit.rake

@@ -1,7 +1,7 @@
 namespace :test do
   desc "Runs unit tests."
   task "unit" do
-    Dir["test/**/*_{spec,test}.rb"].each do |f|
+    Dir["**/test/**/*_{spec,test}.rb"].each do |f|
       sh "rspec --color --format doc '#{f}'"
     end
   end

data/lib/tasks/version.rake

@@ -17,19 +17,23 @@
 #++
 namespace :version do
   def version
-    File.read("VERSION").strip
+    Yast::Tasks.spec_version
   end
 
-  desc "Increase last part of version of file and propagate change with update_spec"
+  desc "Increase the last part of version in package/*.spec files"
   task :bump do
     version_parts = version.split(".")
     version_parts[-1] = (version_parts.last.to_i + 1).to_s
-    File.write("VERSION", version_parts.join(".") + "\n")
-    Rake::Task["version:update_spec"].execute
-  end
+    new_version = version_parts.join(".")
+
+    puts "Updating version to #{new_version}"
+
+    # update all present *.spec files
+    Dir.glob("package/*.spec").each do |spec_file|
+      spec = File.read(spec_file)
+      spec.gsub!(/^\s*Version:.*$/, "Version:        #{new_version}")
 
-  desc "Propagate version from VERSION file to rpm spec file"
-  task :update_spec do
-    sh "sed -i 's/\\(^Version:[[:space:]]*\\)[0-9.]\\+/\\1#{version}/' package/*.spec"
+      File.write(spec_file, spec)
+    end
   end
 end

data/lib/yast/rake.rb

@@ -23,6 +23,14 @@ module Yast
     def self.configuration &block
       ::Packaging.configuration &block
     end
+
+    # read the version from spec file
+    def self.spec_version
+      # use the first *.spec file found, assume all spec files
+      # contain the same version
+      File.readlines(Dir.glob("package/*.spec").first)
+        .grep(/^\s*Version:\s*/).first.sub("Version:", "").strip
+    end
   end
 end
 
@@ -31,8 +39,6 @@ end
 task = Rake::Task["package"]
 prerequisites = task.prerequisites
 prerequisites.delete("test")
-# ensure we have proper version in spec
-prerequisites.push("version:update_spec")
 
 task.enhance(prerequisites)
 
@@ -40,6 +46,7 @@ Yast::Tasks.configuration do |conf|
   conf.obs_project = "YaST:Head"
   conf.obs_sr_project = "openSUSE:Factory"
   conf.package_name = File.read("RPMNAME").strip if File.exists?("RPMNAME")
+  conf.version = Yast::Tasks.spec_version
 end
 
 # load own tasks

metadata

@@ -1,56 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: yast-rake
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packaging_rake_tasks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: ! 'Rake tasks that support work-flow of Yast developer. It allows packaging
-  repo,
-
+description: |
+  Rake tasks that support work-flow of Yast developer. It allows packaging repo,
   send it to build service, create submit request to target repo or run client
-
   from git repo.
-
-'
 email: jreidinger@suse.cz
 executables: []
 extensions: []
@@ -65,27 +56,26 @@ files:
 homepage: http://github.org/openSUSE/yast-rake
 licenses:
 - LGPL v2.1
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rake tasks providing basic work-flow for Yast development
 test_files: []
 has_rdoc: