dr 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 137d8a4e509bb539d890dd7bfa94130de4c0b7ca
-  data.tar.gz: 979a702eb4b6be9b9b8aafc45eae60c5df2202d3
+  metadata.gz: ba4035bfe641151aba4792cf6ebedbc80d1fd2e6
+  data.tar.gz: 715befd405538961117520a551330201fb57c22b
 SHA512:
-  metadata.gz: b3bacafaa074f9d557b9f127a89bc2be8403aa56d316b03b8313c6ce440d86993b2baee8b87cd6fdf1359955e9d51d5bc8aadd5950f496a1205de09f801b0ec0
-  data.tar.gz: 3529bd5e87b98a7c185cfe47acf90075d00f57d5acfe9414b1cee7d0e5966a9870173ebd097a4a59e0e23b3bc56ffeaa85d4f039d28ef0ef45b46b7b63411c2c
+  metadata.gz: bcc322d82a50e31a7c230fc5f7bf9ec66beb1206f4a8c79bd4a427a3a2b931f32ff14183a37f71bfad47d5cd5025ed3759bb0726fbd85ba5cffb43c547301dfb
+  data.tar.gz: e2b1950538b9f104945f86efcaa55a471a2fbbabca3cc8c1f76b27e5e61c5037f7a99e6d6cd63a6951d9c225d2d4723e551fa64a17deb1e5138916da3f940ace

data/bin/dr

@@ -17,10 +17,18 @@ require "dr/shellcmd"
 require "dr/logger"
 require "dr/config"
 
+
 class ExtendedThor < Thor
   private
   include Dr::Logger
 
+
+  def initialize(*args)
+    super
+    Dr::Logger::set_verbosity options[:verbosity]
+  end
+
+
   def get_repo_handle
     if options.has_key? "repo"
       Dr::Repo.new options["repo"]
@@ -35,6 +43,7 @@ class ExtendedThor < Thor
   end
 end
 
+
 class Archive < ExtendedThor
   #desc "save TAG", "make a snapshot of the current archive"
   #def save(tag)
@@ -50,6 +59,7 @@ class Archive < ExtendedThor
   #end
 end
 
+
 class List < ExtendedThor
   desc "packages", "Show a list of source packages in the repo"
   def packages()
@@ -61,6 +71,7 @@ class List < ExtendedThor
     end
   end
 
+
   desc "versions PACKAGE", "Show the history of all available versions for a package"
   def versions(pkg_name)
     repo = get_repo_handle
@@ -82,7 +93,7 @@ class List < ExtendedThor
           line << " " + open + metadata["branch"].fg("blue") + close
         end
 
-        subpkgs = debs.map { |p| subpkg = File.basename(p).split("_")[0] }
+        subpkgs = debs.map { |p| File.basename(p).split("_")[0] }
       end
 
       open = "[".fg "dark-grey"
@@ -120,6 +131,7 @@ class List < ExtendedThor
     end
   end
 
+
   desc "suite SUITE", "Show the names and versions of packages in the suite"
   def suite(suite)
     repo = get_repo_handle
@@ -150,8 +162,11 @@ class List < ExtendedThor
   end
 end
 
+
 class RepoCLI < ExtendedThor
   class_option :repo, :type => :string, :aliases => "-r"
+  class_option :verbosity, :type => :string, :aliases => "-v", :default => "verbose"
+
 
   desc "init [LOCATION]", "setup a whole new repository from scratch"
   def init(location=".")
@@ -176,7 +191,7 @@ class RepoCLI < ExtendedThor
     distro_map = {}
     puts "   Distribution [pick one]: "
     Dr::config.distros.each_with_index do |distro, index|
-      distro_name, distro_params = distro
+      distro_name = distro[0]
       distro_map[index+1] = distro_name
 
       distro_name = distro_name.fg "yellow" if distro_name == repo_conf[:distro]
@@ -215,7 +230,7 @@ class RepoCLI < ExtendedThor
     end
 
     components = ask "   Components [#{repo_conf[:components].join(" ").fg("yellow")}]:"
-    repo_conf[:components] = components.split /\s+/ if components.length > 0
+    repo_conf[:components] = components.split(/\s+/) if components.length > 0
 
     repo_conf[:gpg_name] = ""
     while repo_conf[:gpg_name].length == 0
@@ -242,6 +257,7 @@ class RepoCLI < ExtendedThor
     r.setup repo_conf
   end
 
+
   desc "add", "introduce a new package to the build system"
   method_option :git, :aliases => "-g",
     :desc => "Add source package managed in a git repo"
@@ -267,6 +283,7 @@ class RepoCLI < ExtendedThor
     end
   end
 
+
   desc "build [pkg-name]", "build a package from the sources"
   method_option :branch, :aliases => "-b", :type => :string,
                 :desc => "build from a different branch"
@@ -300,6 +317,7 @@ class RepoCLI < ExtendedThor
     end
   end
 
+
   desc "push [pkg-name]", "push a built package to a specified suite"
   method_option :suite, :aliases => "-s", :type => :string,
                 :desc => "the target suite (defaults to testing)"
@@ -319,12 +337,14 @@ class RepoCLI < ExtendedThor
     repo.push pkg_name, version, suite, options["force"] == true
   end
 
+
   desc "unpush [pkg-name] [suite]", "remove a built package from a suite"
   def unpush(pkg_name, suite)
     repo = get_repo_handle
     repo.unpush pkg_name, suite
   end
 
+
   desc "list SUBCOMMAND [ARGS]", "show information about packages"
   map "l" => :list, "ls" => :list
   subcommand "list", List
@@ -337,6 +357,7 @@ class RepoCLI < ExtendedThor
     repo.remove pkg_name, options["force"] == true
   end
 
+
   desc "rmbuild [pkg-name] [version]", "remove a built version of a package"
   method_option :force, :aliases => "-f", :type => :boolean,
                 :desc => "force removal even if the build is still used"
@@ -376,6 +397,7 @@ class RepoCLI < ExtendedThor
     log :info, "Updated #{updated.to_s.fg "blue"} packages in #{suite.fg "blue"}"
   end
 
+
   desc "git-tag-release", "Mark relased packages' repositories"
   method_option :force, :aliases => "-f", :type => :boolean,
                 :desc => "Force override existing tags"
@@ -410,6 +432,7 @@ class RepoCLI < ExtendedThor
     end
   end
 
+
   desc "release", "Push all the packages from testing to release"
   method_option :force, :aliases => "-f", :type => :boolean,
                 :desc => "Force-push all released packages"
@@ -434,6 +457,7 @@ class RepoCLI < ExtendedThor
     end
   end
 
+
   desc "force-sync", "Force cloning the sources repository from scratch again"
   def force_sync(pkg_name)
     repo = get_repo_handle
@@ -458,6 +482,7 @@ class RepoCLI < ExtendedThor
   end
 end
 
+
 begin
   Dr::check_dependencies [
     "git", "reprepro", "gzip", "debuild", "debootstrap", "qemu-*-static",

data/dr.spec

@@ -25,11 +25,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor", "~> 0.18.1"
-  spec.add_dependency "tco", "~> 0.0.1"
-  spec.add_dependency "octokit"
+  spec.add_dependency "thor", "~> 0.18"
+  spec.add_dependency "tco", "~> 0.1"
+  spec.add_dependency "octokit", "~> 3.3"
 
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rake", "~> 10.3"
+  spec.add_development_dependency "rspec", "~> 3.1"
 end

data/lib/dr/gitpackage.rb

@@ -185,7 +185,10 @@ module Dr
             FileUtils.cp_r src_dir, build_dir
 
             # Make orig tarball
-            files = Dir["#{build_dir}/*"].map { |f| "\"#{File.basename f}\"" }.join " "
+            all_files = Dir["#{build_dir}/*"] + Dir["#{build_dir}/.*"]
+            excluded_files = ['.', '..', '.git']
+            selected_files = all_files.select { |path| !excluded_files.include?(File.basename(path)) }
+            files = selected_files.map { |f| "\"#{File.basename f}\"" }.join " "
             log :info, "Creating orig source tarball"
             tar = "tar cz -C #{build_dir} --exclude=debian " +
                   "-f #{br}/#{@name}_#{version.upstream}.orig.tar.gz " +
@@ -322,7 +325,7 @@ EOS
     def get_repo_url
       git_cmd = "git --git-dir #{@git_dir} config --get remote.origin.url"
       git = ShellCmd.new git_cmd, :tag => "git"
-      git.out
+      git.out.strip
     end
 
     def get_version(changelog_file)

data/lib/dr/logger.rb

@@ -73,30 +73,55 @@ Tco::reconfigure tco_conf
 
 module Dr
   module Logger
-    @@logger_options = {
+    @@message_types = {
       :info => "info",
       :warn => "warn",
       :err  => "err",
       :debug => "debug"
     }
 
-    def self.log(level, msg)
+    @@verbosity = :verbose
+    @@logger_verbosity_levels = {
+      :essential => 0,
+      :important => 1,
+      :informative => 2,
+      :verbose => 3
+    }
+
+    def self.set_verbosity(level)
+      msg = "Message verbosity level not recognised (#{})."
+      raise msg unless @@logger_verbosity_levels.has_key? level.to_sym
+
+      @@verbosity = level.to_sym
+    end
+
+    def self.log(msg_type, msg, verbosity=nil)
       out = "dr".style("log-head") << " "
 
-      case level
-      when :info  then out << "info".style(@@logger_options[:info])
-      when :warn  then out << "WARN".style(@@logger_options[:warn])
-      when :err   then out << "ERR!".style(@@logger_options[:err])
-      when :debug then out << "dbg?".style(@@logger_options[:debug])
+      case msg_type
+      when :info
+        out << "info".style(@@message_types[:info])
+        verbosity = :informative unless verbosity
+      when :warn
+        out << "WARN".style(@@message_types[:warn])
+        verbosity = :informative unless verbosity
+      when :err
+        out << "ERR!".style(@@message_types[:err])
+        verbosity = :essential unless verbosity
+      when :debug
+        out << "dbg?".style(@@message_types[:debug])
+        verbosity = :verbose unless verbosity
       end
 
-      out << " " << msg.chomp
-      puts out
-      STDOUT.flush
+      if verbosity <= @@verbosity
+        out << " " << msg.chomp
+        puts out
+        STDOUT.flush
+      end
     end
 
-    def log(level, msg)
-      Logger::log level, msg
+    def log(msg_type, msg)
+      Logger::log msg_type, msg
     end
 
     def tag(tag, msg)

data/lib/dr/version.rb

@@ -2,5 +2,5 @@
 # License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
 
 module Dr
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Radek Pazdera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: tco
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 description: |-
   dr works with distribution-level packaging
                             tools and helps you make and distribute your own
@@ -107,7 +107,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -138,17 +138,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: dr stands for debian-repository. It is a packaging tool that helps you make,