package_cloud 0.2.0 → 0.2.1

data/lib/package_cloud/cli/entry.rb

@@ -11,13 +11,43 @@ module PackageCloud
       subcommand "master_token", MasterToken
 
 
-      desc "push user/repo[/distro/version] /path/to/package",
-           "push package to repository (in distro/version if required)"
-      def push(repo, package_file)
+      desc "push user/repo[/distro/version] /path/to/packages",
+           "push package(s) to repository (in distro/version if required)"
+      def push(repo, package_file, *package_files)
         ARGV.clear # otherwise gets explodes
+        package_files << package_file
+
+        exts = package_files.map { |f| f.split(".").last }.uniq
+
+        if package_files.length > 1 && exts.length > 1
+          abort("You can't push multiple packages of different types at the same time.\nFor example, use *.deb to push all your debs at once.".red)
+        end
+
+        invalid_packages = package_files.select do |f|
+          !["gem", "deb", "rpm"].include?(f.split(".").last)
+        end
+
+        if invalid_packages.any?
+          message = "I don't know how to push these packages:\n\n".red
+          invalid_packages.each do |p|
+            message << "  #{p}\n"
+          end
+          message << "\npackage_cloud only supports debs, gems, and rpms.".red
+          abort(message)
+        end
+
+        if exts.first == "gem" && package_files.length > 1
+          answer = get_valid("Are you sure you want to push #{package_files.length} packages? (y/n)") do |s|
+            s == "y" || s == "n"
+          end
+
+          if answer != "y"
+            puts "Aborting...".red
+          end
+        end
 
         validator = Validator.new(client)
-        dist_id   = validator.distribution_id(repo, package_file)
+        dist_id   = validator.distribution_id(repo, package_files, exts.first)
 
         # strip os/dist
         repo = repo.split("/")[0..1].join("/")
@@ -25,9 +55,27 @@ module PackageCloud
         print "Looking for repository at #{repo}... "
         repo = client.repository(repo)
         print "success!\n"
-        print "Pushing #{package_file}... "
-        repo.create_package(package_file, dist_id)
+        package_files.each do |f|
+          print "Pushing #{f}... "
+          repo.create_package(f, dist_id)
+        end
       end
+
+      private
+        def get_valid(prompt)
+          selection = ""
+          times = 0
+          until yield(selection)
+            if times > 0
+              puts "#{selection} is not a valid selection."
+            end
+            print "#{prompt}: "
+            selection = ::Kernel.gets.chomp
+            times += 1
+          end
+
+          selection
+        end
     end
   end
 end

data/lib/package_cloud/validator.rb

@@ -4,9 +4,7 @@ module PackageCloud
       @client = client
     end
 
-    def distribution_id(repo, filename)
-      package_type = filename.split(".").last
-
+    def distribution_id(repo, filenames, package_type)
       if distributions[package_type]
         _,_,dist_sel,ver_sel = repo.split("/")
         
@@ -20,15 +18,15 @@ module PackageCloud
               ver["id"]
             else
               puts "#{ver_sel} isn't a valid version of #{dist["display_name"]}\n\n"
-              select_dist(repo, filename, package_type)
+              select_dist(repo, filenames, package_type)
             end
           else
             puts "#{dist_sel} isn't a valid operating system.\n\n"
-            select_dist(repo, filename, package_type)
+            select_dist(repo, filenames, package_type)
           end
         else
           puts "#{package_type} packages require an operating system and version to be selected.\n\n"
-          select_dist(repo, filename, package_type)
+          select_dist(repo, filenames, package_type)
         end
       else
         nil
@@ -63,7 +61,7 @@ module PackageCloud
         selection
       end
 
-      def select_dist(repo, filename, package_type)
+      def select_dist(repo, filenames, package_type)
         puts "If you don't see your OS or version here, send us an email at support@packagecloud.io:\n\n"
         distros = distributions[package_type]
         distros.each_with_index do |dist, index|
@@ -81,7 +79,11 @@ module PackageCloud
         repo = repo.split("/")[0..1].join("/")
         os_shortcut = "#{distro["index_name"]}/#{version["index_name"]}"
         shortcut = "#{repo}/#{os_shortcut}"
-        puts "\nPush #{filename} to #{shortcut}? "
+        if filenames.length > 1
+          puts "\nPush #{filenames.length} packages to #{shortcut}? "
+        else
+          puts "\nPush #{filenames.first} to #{shortcut}? "
+        end
         answer = get_valid("(y/n)") { |sel| sel == "y" || sel == "n" }
 
         if answer == "y"

data/lib/package_cloud/version.rb

@@ -1,7 +1,7 @@
 module PackageCloud
   MAJOR_VERSION = "0"
   MINOR_VERSION = "2"
-  PATCH_VERSION = "0"
+  PATCH_VERSION = "1"
 
   VERSION = [MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION].join(".")
 end

metadata

@@ -2,7 +2,7 @@
 name: package_cloud
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - James Golick
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-04-14 00:00:00 Z
+date: 2014-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor