package_cloud 0.1.3 → 0.2.0

data/bin/package_cloud

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require "package_cloud"
 
-PackageCloud::CLI.start(ARGV)
+PackageCloud::CLI::Entry.start(ARGV)

data/lib/package_cloud.rb

@@ -6,7 +6,9 @@ module PackageCloud
   autoload :CLI, "package_cloud/cli"
   autoload :Client, "package_cloud/client"
   autoload :ConfigFile, "package_cloud/config_file"
+  autoload :MasterToken, "package_cloud/master_token"
   autoload :Object, "package_cloud/object"
+  autoload :ReadToken, "package_cloud/read_token"
   autoload :Repository, "package_cloud/repository"
   autoload :Validator, "package_cloud/validator"
 end

data/lib/package_cloud/auth.rb

@@ -5,7 +5,7 @@ module PackageCloud
   module Auth
     class << self
       def get_token(url)
-        JSON.parse(RestClient.get("#{url}/token.json"))["token"]
+        JSON.parse(RestClient.get("#{url}/api/v1/token.json"))["token"]
       end
     end
   end

data/lib/package_cloud/cli.rb

@@ -2,104 +2,27 @@ require "colorize"
 require "thor"
 
 module PackageCloud
-  class CLI < Thor
-    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
+  module CLI 
+    autoload :Distro,      "package_cloud/cli/distro"
+    autoload :Entry,       "package_cloud/cli/entry"
+    autoload :MasterToken, "package_cloud/cli/master_token"
+    autoload :Repository,  "package_cloud/cli/repository"
+
+    class Base < Thor
+      class_option "config"
+      class_option "url"
+
+      private
+        def config
+          @config ||= begin
+            ConfigFile.new(options[:config] || "~/.packagecloud",
+                         options[:url] || "https://packagecloud.io").tap(&:read_or_create)
+                      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)
-      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 "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
+        def client
+          @client ||= Client.new(config)
         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"
-      pid = fork { exec(repo.install_script(package_type)) }
-      Process.waitpid(pid)
     end
-
-    private
-      def config
-        @config ||= begin
-          ConfigFile.new(options[:config] || "~/.packagecloud",
-                       options[:url] || "https://packagecloud.io").tap(&:read_or_create)
-                    end
-      end
-
-      def client
-        @client ||= Client.new(config)
-      end
   end
 end

data/lib/package_cloud/cli/distro.rb

@@ -0,0 +1,26 @@
+module PackageCloud
+  module CLI
+    class Distro < Base
+      desc "list package_type",
+           "list available distros and versions for package_type"
+      def list(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
+    end
+  end
+end

data/lib/package_cloud/cli/entry.rb

@@ -0,0 +1,33 @@
+module PackageCloud
+  module CLI
+    class Entry < Base
+      desc "repository SUBCMD ...ARGS", "manage repositories"
+      subcommand "repository", Repository
+
+      desc "distro SUBCMD ...ARGS", "manage repositories"
+      subcommand "distro", Distro
+
+      desc "master_token SUBCMD ...ARGS", "manage master tokens"
+      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)
+        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
+    end
+  end
+end

data/lib/package_cloud/cli/master_token.rb

@@ -0,0 +1,89 @@
+module PackageCloud
+  module CLI 
+    class MasterToken < Base
+      desc "list user/repository",
+           "list master tokens for specified repository"
+      def list(repo_name)
+        print "Looking for repository at #{repo_name}... "
+        repo = client.repository(repo_name)
+        print "success!\n"
+
+        tokens = repo.master_tokens
+        puts "Tokens for #{repo_name}:"
+        puts ""
+        tokens.each_with_index do |token, i|
+          puts "  #{token.name}"
+          puts "  read tokens:"
+          token.read_tokens.each do |read_token|
+          puts "    #{read_token.name}"
+          end
+          puts "" unless i == tokens.length - 1
+        end
+      end
+
+      desc "create user/repository token_name",
+           "create a master token for the specified repository"
+      def create(repo_name, token_name)
+        print "Looking for repository at #{repo_name}... "
+        repo = client.repository(repo_name)
+        print "success!\n"
+
+        print "Attempting to create token named #{token_name}... "
+        repo.create_master_token(token_name)
+        print "success!\n".green
+      end
+
+      desc "destroy user/repository token_name",
+           "destroy a master token for the specified repository"
+      def destroy(repo_name, token_name)
+        ARGV.clear # otherwise gets explodes
+
+        if token_name == "default"
+          abort("You can't delete the default master_token.".red)
+        end
+
+        print "Looking for repository at #{repo_name}... "
+        repo = client.repository(repo_name)
+        print "success!\n"
+
+        token = repo.master_tokens.detect do |token|
+          token.name == token_name
+        end
+
+        if token
+          msg = "\nAre you sure you want to delete #{token_name}?"
+          msg << " #{token.read_tokens.length} read tokens will no longer work afterwards (y/n)" if token.read_tokens.length > 0
+          answer = get_valid(msg) do |s|
+            s == "y" || s == "n"
+          end
+          if answer == "y"
+            print "Attempting to destroy token named #{token_name}... "
+            token.destroy
+            print "success!\n".green
+          else
+            puts "Aborting...".red
+          end
+        else
+          puts "Wasn't able to find a token named #{token_name}.".red
+          exit(1)
+        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/cli/repository.rb

@@ -0,0 +1,50 @@
+module PackageCloud
+  module CLI
+    class Repository < Base
+      option :private
+      desc "create repo_name",
+           "create repository called repo_name"
+      def create(repo_name)
+        config.read_or_create
+        client = Client.new(config)
+
+        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"
+        pid = fork { exec(repo.install_script(package_type)) }
+        Process.waitpid(pid)
+      end
+    end
+  end
+end

data/lib/package_cloud/client.rb

@@ -10,7 +10,7 @@ module PackageCloud
     def repositories
       base_url = @config.base_url
       begin
-        attrs = JSON.parse(RestClient.get("#{base_url}/repositories.json"))
+        attrs = JSON.parse(RestClient.get("#{base_url}/api/v1/repos.json"))
         attrs.map { |a| Repository.new(a, @config) }
       rescue RestClient::ResourceNotFound => e
         print "failed!\n".red
@@ -22,7 +22,7 @@ module PackageCloud
       base_url = @config.base_url
       user, repo = name.split("/")
       begin
-        attrs = JSON.parse(RestClient.get("#{base_url}/#{user}/#{repo}.json"))
+        attrs = JSON.parse(RestClient.get("#{base_url}/api/v1/repos/#{user}/#{repo}.json"))
         Repository.new(attrs, @config)
       rescue RestClient::ResourceNotFound => e
         print "failed!\n".red
@@ -33,7 +33,7 @@ module PackageCloud
     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"}))
+        JSON.parse(RestClient.post("#{base_url}/api/v1/repos.json", :repository => {:name => name, :private => priv == "private" ? "1" : "0"}))
       rescue RestClient::UnprocessableEntity => e
         print "error!\n".red
         json = JSON.parse(e.response)
@@ -48,7 +48,17 @@ module PackageCloud
     def distributions
       base_url = @config.base_url
       begin
-        JSON.parse(RestClient.get("#{base_url}/distributions.json"))
+        JSON.parse(RestClient.get("#{base_url}/api/v1/distributions.json"))
+      rescue RestClient::ResourceNotFound => e
+        print "failed!\n".red
+        exit(127)
+      end
+    end
+
+    def gem_version
+      base_url = @config.base_url
+      begin
+        JSON.parse(RestClient.get("#{base_url}/api/v1/gem_version"))
       rescue RestClient::ResourceNotFound => e
         print "failed!\n".red
         exit(127)

data/lib/package_cloud/config_file.rb

@@ -17,6 +17,7 @@ module PackageCloud
         attrs = JSON.parse(File.read(@filename))
         @token = attrs["token"] if attrs.has_key?("token")
         @url   = URI(attrs["url"]) if attrs.has_key?("url")
+        assert_reasonable_gem_version
       else
         puts "No config file exists at #{@filename}. Login to create one."
 
@@ -55,5 +56,14 @@ module PackageCloud
         File.open(@filename, "w", 0600) { |f| f << JSON.dump(attrs); f << "\r\n" }
         puts "success!"
       end
+
+      def assert_reasonable_gem_version
+        gem_version = Client.new(self).gem_version
+        if gem_version["minor"] != MINOR_VERSION
+          abort("This gem is out of date. Please update it!".red)
+        elsif gem_version["patch"] > PATCH_VERSION
+          $stderr << "[WARNING] There's a newer version of the package_cloud gem. Install it when you get a chance!\n"
+        end
+      end
   end
 end

data/lib/package_cloud/master_token.rb

@@ -0,0 +1,19 @@
+module PackageCloud
+  class MasterToken < Object
+    def initialize(attrs, config)
+      @attrs = attrs
+      @config = config
+    end
+
+    def read_tokens
+      @attrs["read_tokens"].map do |read_token|
+        ReadToken.new(read_token)
+      end
+    end
+
+    def destroy
+      url = @config.base_url + paths["self"]
+      RestClient.delete(url)
+    end
+  end
+end

data/lib/package_cloud/read_token.rb

@@ -0,0 +1,7 @@
+module PackageCloud
+  class ReadToken < Object
+    def initialize(attrs)
+      @attrs = attrs
+    end
+  end
+end

data/lib/package_cloud/repository.rb

@@ -25,10 +25,31 @@ module PackageCloud
     end
 
     def install_script(type)
-      url = paths["install_script"].gsub(/:package_type/, type)
+      url = urls["install_script"].gsub(/:package_type/, type)
       RestClient.get(url)
     end
 
+    def master_tokens
+      url = @config.base_url + paths["master_tokens"]
+      attrs = JSON.parse(RestClient.get(url))
+      attrs.map { |a| MasterToken.new(a, @config) }
+    end
+
+    def create_master_token(name)
+      url = @config.base_url + paths["create_master_token"]
+      begin
+        RestClient.post(url, :master_token => {:name => name})
+      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 private_human
       send(:private) ? "private".red : "public".green
     end

data/lib/package_cloud/version.rb

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

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: package_cloud
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - James Golick
@@ -9,12 +10,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-04 00:00:00 Z
+date: 2014-04-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -25,6 +27,7 @@ dependencies:
   name: highline
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -35,6 +38,7 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -45,6 +49,7 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -55,6 +60,7 @@ dependencies:
   name: colorize
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -65,6 +71,7 @@ dependencies:
   name: bundler
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -75,9 +82,9 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - &id008 
-      - ">="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
@@ -101,9 +108,15 @@ files:
 - lib/package_cloud.rb
 - lib/package_cloud/auth.rb
 - lib/package_cloud/cli.rb
+- lib/package_cloud/cli/distro.rb
+- lib/package_cloud/cli/entry.rb
+- lib/package_cloud/cli/master_token.rb
+- lib/package_cloud/cli/repository.rb
 - lib/package_cloud/client.rb
 - lib/package_cloud/config_file.rb
+- lib/package_cloud/master_token.rb
 - lib/package_cloud/object.rb
+- lib/package_cloud/read_token.rb
 - lib/package_cloud/repository.rb
 - lib/package_cloud/validator.rb
 - lib/package_cloud/version.rb
@@ -111,25 +124,30 @@ files:
 homepage: https://packagecloud.io
 licenses: 
 - MIT
-metadata: {}
-
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id008
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id008
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: https://packagecloud.io
 test_files: []
 
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA512: 
-  data.tar.gz: 674a58d089c083097afa436918d5d31a62b0d9266d42b08db982d2513de5d9725cdb7af305b7462162cf0ea71eded879c96aad518943ddc2ee95dcc140527b51
-  metadata.gz: 6695cc5d8daccd1b9e631b1ab21f0d2cf1298e024419fd8a38ef8ac02a0c3779620a9f880ce3e7095eed6707b5148bfd737ab889fb92e6664a52d34a92622857
-SHA1: 
-  data.tar.gz: 79e329454ab6a8deaa1a86bb5fa6dda54eaff956
-  metadata.gz: 1a6346259c8e321a6d1fa20f415e2b9389eff0e9