package_cloud 0.0.3 → 0.1.0

data/lib/package_cloud.rb

@@ -8,4 +8,5 @@ module PackageCloud
   autoload :ConfigFile, "package_cloud/config_file"
   autoload :Object, "package_cloud/object"
   autoload :Repository, "package_cloud/repository"
+  autoload :Validator, "package_cloud/validator"
 end

data/lib/package_cloud/cli.rb

@@ -3,20 +3,103 @@ require "thor"
 
 module PackageCloud
   class CLI < Thor
-    option "config"
-    option "url"
-    desc "push user/repo /path/to/package",
-         "push package to repository"
+    class_option "config"
+    class_option "url"
+
+    desc "list_distros package_type",
+         "list available distros and versions for package_type"
+    def list_distros(package_type)
+      distros = client.distributions[package_type]
+      if distros
+        puts "Listing distributions for #{package_type}:"
+        distros.each do |distro|
+          puts "\n    #{distro["display_name"]} (#{distro["index_name"]}):\n\n"
+          distro["versions"].each do |ver|
+            puts "        #{ver["display_name"]} (#{ver["index_name"]})"
+          end
+        end
+
+        puts "\nIf you don't see your distribution or version here, email us at support@packagecloud.io."
+      else
+        puts "No distributions exist for #{package_type}.".red
+        puts "That either means that we don't support #{package_type} or that it doesn't require a distribution/version."
+        exit(1)
+      end
+    end
+
+    desc "push user/repo[/distro/version] /path/to/package",
+         "push package to repository (in distro/version if required)"
     def push(repo, package_file)
-      config = ConfigFile.new(options[:config] || "~/.packagecloud",
-                              options[:url] || "packagecloud.io")
+      ARGV.clear # otherwise gets explodes
+
+      validator = Validator.new(client)
+      dist_id   = validator.distribution_id(repo, package_file)
+
+      # strip os/dist
+      repo = repo.split("/")[0..1].join("/")
+
+      print "Looking for repository at #{repo}... "
+      repo = client.repository(repo)
+      print "success!\n"
+      print "Pushing #{package_file}... "
+      repo.create_package(package_file, dist_id)
+    end
+
+    option :private
+    desc "create repo_name",
+         "create repository called repo_name"
+    def create(repo_name)
       config.read_or_create
       client = Client.new(config)
-      print "Trying to find a repository at #{repo}... "
+
+      print "Looking for repository at #{repo_name}... "
+      repo = client.create_repo(repo_name, options[:private])
+      print "success!\n".green
+      puts "Your repository has been created at:"
+      puts "    #{repo["url"]}"
+    end
+
+    desc "list",
+         "list your repositories"
+    def list
+      repos = client.repositories
+      if repos.length == 0
+        puts "You have no repositories at the moment. Create one!"
+      else
+        puts "Your repositories:"
+        puts ""
+        repos.each_with_index do |repo, i|
+          puts "  #{repo.fqname} (#{repo.private_human})"
+          puts "  last push: #{repo.last_push_human} | packages: #{repo.package_count_human}"
+          puts "" unless i == repos.length - 1
+        end
+      end
+    end
+
+    desc "install user/repo package_type",
+         "install user/repo for package_type"
+    def install(repo, package_type)
+      if Process.uid != 0 && package_type != "gem"
+        abort("You have to run install as root.".red)
+      end
+
+      print "Locating repository at #{repo}... "
       repo = client.repository(repo)
       print "success!\n"
-      print "Pushing package #{package_file}... "
-      repo.create_package(package_file)
+      pid = fork { exec(repo.install_script(package_type)) }
+      Process.waitpid(pid)
     end
+
+    private
+      def config
+        @config ||= begin
+          ConfigFile.new(options[:config] || "~/.packagecloud",
+                       options[:url] || "packagecloud.io").tap(&:read_or_create)
+                    end
+      end
+
+      def client
+        @client ||= Client.new(config)
+      end
   end
 end

data/lib/package_cloud/client.rb

@@ -7,6 +7,17 @@ module PackageCloud
       @config = config
     end
 
+    def repositories
+      base_url = @config.base_url
+      begin
+        attrs = JSON.parse(RestClient.get("#{base_url}/repositories.json"))
+        attrs.map { |a| Repository.new(a, @config) }
+      rescue RestClient::ResourceNotFound => e
+        print "failed!\n".red
+        exit(127)
+      end
+    end
+
     def repository(name)
       base_url = @config.base_url
       user, repo = name.split("/")
@@ -18,5 +29,30 @@ module PackageCloud
         exit(127)
       end
     end
+
+    def create_repo(name, priv)
+      base_url = @config.base_url
+      begin
+        JSON.parse(RestClient.post("#{base_url}/repositories.json", repository: {name: name, private: priv == "private" ? "1" : "0"}))
+      rescue RestClient::UnprocessableEntity => e
+        print "error!\n".red
+        json = JSON.parse(e.response)
+        json.each do |k,v|
+          puts "\n\t#{k}: #{v.join(", ")}\n"
+        end
+        puts ""
+        exit(1)
+      end
+    end
+
+    def distributions
+      base_url = @config.base_url
+      begin
+        JSON.parse(RestClient.get("#{base_url}/distributions.json"))
+      rescue RestClient::ResourceNotFound => e
+        print "failed!\n".red
+        exit(127)
+      end
+    end
   end
 end

data/lib/package_cloud/config_file.rb

@@ -28,7 +28,7 @@ module PackageCloud
     end
 
     def base_url(username = token, password = "")
-      "https://#{CGI.escape(username)}:#{CGI.escape(password)}@#{url}"
+      "http://#{CGI.escape(username)}:#{CGI.escape(password)}@#{url}"
     end
 
     private

data/lib/package_cloud/repository.rb

@@ -5,12 +5,13 @@ module PackageCloud
       @config = config
     end
 
-    def create_package(file_path)
+    def create_package(file_path, dist_id)
       file_data = File.new(file_path, 'rb')
       base_url = @config.base_url 
       url = base_url + paths["create_package"]
       begin
-        RestClient.post(url, package: {package_file: file_data})
+        RestClient.post(url, package: {package_file:      file_data,
+                                       distro_version_id: dist_id})
         print "success!\n".green
       rescue RestClient::UnprocessableEntity => e
         print "error:\n".red
@@ -22,5 +23,14 @@ module PackageCloud
         exit(1)
       end
     end
+
+    def install_script(type)
+      url = paths["install_script"].gsub(/:package_type/, type)
+      RestClient.get(url)
+    end
+
+    def private_human
+      send(:private) ? "private".red : "public".green
+    end
   end
 end

data/lib/package_cloud/validator.rb

@@ -0,0 +1,96 @@
+module PackageCloud
+  class Validator
+    def initialize(client)
+      @client = client
+    end
+
+    def distribution_id(repo, filename)
+      package_type = filename.split(".").last
+
+      if distributions[package_type]
+        _,_,dist_sel,ver_sel = repo.split("/")
+        
+        if dist_sel && ver_sel
+          dist = distributions[package_type].detect { |d| d["index_name"] == dist_sel }
+
+          if dist
+            ver = dist["versions"].detect { |v| v["index_name"] == ver_sel }
+
+            if ver
+              ver["id"]
+            else
+              puts "#{ver_sel} isn't a valid version of #{dist["display_name"]}\n\n"
+              select_dist(repo, filename, package_type)
+            end
+          else
+            puts "#{dist_sel} isn't a valid operating system.\n\n"
+            select_dist(repo, filename, 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)
+        end
+      else
+        nil
+      end
+    end
+
+    private
+      def distributions
+        @distributions ||= @client.distributions
+      end
+
+      def select_from(list)
+        selection = get_valid("0-#{list.length - 1}") do |s|
+          s =~ /^\d+$/ && list[s.to_i]
+        end
+
+        list[selection.to_i]
+      end
+
+      def get_valid(prompt)
+        selection = ""
+        times = 0
+        until yield(selection)
+          if times > 0
+            puts "#{selection} is not a valid selection."
+          end
+          print "\n #{prompt}: "
+          selection = ::Kernel.gets.chomp
+          times += 1
+        end
+
+        selection
+      end
+
+      def select_dist(repo, filename, 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|
+          puts "\t#{index}. #{dist["display_name"]}"
+        end
+
+        distro = select_from(distros)
+
+        puts "\nYou selected #{distro["display_name"]}. Select a version:\n\n"
+        distro["versions"].each_with_index do |ver, index|
+          puts "\t#{index}. #{ver["display_name"]} (#{ver["index_name"]})"
+        end
+        version = select_from(distro["versions"])
+
+        repo = repo.split("/")[0..1].join("/")
+        os_shortcut = "#{distro["index_name"]}/#{version["index_name"]}"
+        shortcut = "#{repo}/#{os_shortcut}"
+        puts "\nPush #{filename} to #{shortcut}? "
+        answer = get_valid("(y/n)") { |sel| sel == "y" || sel == "n" }
+
+        if answer == "y"
+          print "\nContinuing...".green 
+          puts " Note that next time you can push directly to #{os_shortcut} by specifying #{shortcut} on the commandline."
+          version["id"]
+        else
+          abort("Cancelled.")
+        end
+      end
+  end
+end

data/lib/package_cloud/version.rb

@@ -1,3 +1,3 @@
 module PackageCloud
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: package_cloud
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - James Golick
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-15 00:00:00 Z
+date: 2014-02-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -112,6 +112,7 @@ files:
 - lib/package_cloud/config_file.rb
 - lib/package_cloud/object.rb
 - lib/package_cloud/repository.rb
+- lib/package_cloud/validator.rb
 - lib/package_cloud/version.rb
 - package_cloud.gemspec
 homepage: https://packagecloud.io
@@ -143,3 +144,4 @@ specification_version: 3
 summary: https://packagecloud.io
 test_files: []
 
+has_rdoc: