apperol 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db158e412b26ecb904f357742bd9e6560d573627
-  data.tar.gz: 9d9939c3ec0104b2a3c1b860268b9a6cee9c22ae
+  metadata.gz: 91a4bdc6aea992758e4cdc112eab66f5b7a9fb4a
+  data.tar.gz: 680dd1c4cc9449cfce6a1befb765e6997402fbbd
 SHA512:
-  metadata.gz: d15027aed70b6c7850587104b070477df35d4eecca06a640c4ab5a1c583b61a88682aa4cbf7a50881cd1ef2a33dff2eba09e124cb170b923d6201b8c3b5b366d
-  data.tar.gz: 059e5e660c1b8c106ec44492df8d5505e128fe04f264f7ff78c065778ee15a41a8f2849cb5985d3ca7a1d885825daf453b6b1a1a1aedc2fbe686325f1c71ceda
+  metadata.gz: 819ddb160d318ba1219955f387c0580ba4024f62b33972aaf62f8f887d4de726e43afb44537b1492c0e321207539bd445f67e17d68e69848550b7eaccb3c5261
+  data.tar.gz: dd90401ab6224e5ee517339359aec58c063be4570b1cd8d92bba4416367a1d6f7b031b05c4fab5367ac124bb712fa2eb4dc56e828b577ce68c419d1f0c11a49c

data/README.md

@@ -1,5 +1,7 @@
 # Apperol
 
+![](http://cl.ly/image/0C230a0p2p0G/apperol.png)
+
 Create apps from heroku repositories on GitHub.
 Use app.json to customize options.
 
@@ -41,7 +43,7 @@ Usage: apperol [options] [app_extension]
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/apperol/fork )
+1. Fork it ( https://github.com/ys/apperol/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/apperol.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["yannick@heroku.com"]
   spec.summary       = %q{Create heroku app from heroku repository}
   spec.description   = %q{Create heroku app from heroku repository with app.json}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/ys/apperol"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/apperol/cli.rb

@@ -19,27 +19,27 @@ module Apperol
           option_key_name = key.downcase.gsub("_", "-")
           option_key_key = key.downcase.to_sym
           # Set default
-          @options[option_key_key] = definition["value"]
-          opts.on("--#{option_key_name} value", "#{definition["description"]} (Default: '#{definition["value"]}')") do |value|
+          value = definition.is_a?(String) ? definition : definition["value"]
+          @options[option_key_key] = value
+          required = definition.is_a?(String) || definition["required"].nil? || definition["required"] ? " required" : ""
+          description = definition.is_a?(String) ? key : definition["description"]
+          opts.on("--#{option_key_name} value", "#{description} (Default: '#{value}' #{required}) ") do |value|
             @options[option_key_key] = value
           end
         end
         opts.on("-p", "--personal", "Force app in personal apps instead of orgs") do
           @options[:personal] = true
         end
-        opts.on("-r", "--repo repo", "GitHub repository used for the deploy") do |repo|
+        opts.on("-r", "--repo repo", "GitHub repository used for the deploy (Default: user/dir_name)") do |repo|
           @options[:repo] = repo
         end
-        opts.on("-o", "--org org", "GitHub org where current repo is located") do |org|
-          @options[:org] = org
+        opts.on("-u", "--user user", "GitHub user where current repo is located (Default: Your GitHub username)") do |user|
+          @options[:user] = user
         end
-        opts.on("-u", "--user user", "GitHub user where current repo is located") do |user|
-          @options[:org] = user
-        end
-        opts.on("-s", "--stack stack", "Stack for app on heroku") do |stack|
+        opts.on("-s", "--stack stack", "Stack for app on heroku (Default: cedar-14)") do |stack|
           @options[:stack] = stack
         end
-        opts.on("-b", "--branch branch", "Branch to setup app from") do |branch|
+        opts.on("-b", "--branch branch", "Branch to setup app from (Default: master)") do |branch|
           @options[:branch] = branch
         end
         opts.on('-h', '--help', 'Displays Help') do
@@ -58,7 +58,8 @@ module Apperol
     end
 
     def call
-      heroku_app_setup
+      # heroku_app_setup
+      app_setup_payload
     end
 
     def heroku_app_setup
@@ -144,7 +145,7 @@ module Apperol
       required_not_filled = []
       app_json["env"].each do |key, definition|
         value = @options[key.downcase.to_sym]
-        if definition["required"] && value.strip.empty?
+        if (definition["required"].nil? || definition["required"]) && value.strip.empty?
           required_not_filled << key
         end
         payload[:overrides][:env][key] = value
@@ -159,17 +160,22 @@ module Apperol
 
     def github_tarball_location
       $stdout.puts("Getting tarball location for empirical branch #{github_branch}")
-      req = Net::HTTP::Get.new(github_url)
-      req.basic_auth *github_creds
-      res = github_http.request(req)
+      res = github_get(tarball_path)
       if res["Location"]
         res["Location"]
       else
-        $stderr.puts("error: No tarball found for #{github_url} : #{JSON.parse(res.body)["message"]}")
+        $stderr.puts("error: No tarball found for #{github_url + tarball_path} : #{JSON.parse(res.body)["message"]}")
         exit 1
       end
     end
 
+    def github_get(path)
+      puts github_url + path
+      req = Net::HTTP::Get.new(github_url + path)
+      req.basic_auth *github_creds
+      github_http.request(req)
+    end
+
     def github_http
       @github_http ||= Net::HTTP.new(github_url.hostname, github_url.port).tap do |http|
         http.use_ssl = true
@@ -185,11 +191,14 @@ module Apperol
     end
 
     def default_repo
-      "#{org}/#{heroku_app_name}"
+      "#{user}/#{heroku_app_name}"
     end
 
-    def org
-      @options.fetch(:org, "heroku")
+    def user
+      @user ||= @options.fetch(:user) {
+        res = github_get("/user")
+        JSON.parse(res.body)["login"]
+      }
     end
 
     def rollbar_token
@@ -214,7 +223,11 @@ module Apperol
     end
 
     def github_url
-      @github_url ||= URI("https://api.github.com/repos/#{repo}/tarball/#{github_branch}")
+      URI("https://api.github.com")
+    end
+
+    def tarball_path
+      "/repos/#{repo}/tarball/#{github_branch}"
     end
 
     def github_creds

data/lib/apperol/version.rb

@@ -1,3 +1,3 @@
 module Apperol
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apperol
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yannick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,7 @@ files:
 - lib/apperol.rb
 - lib/apperol/cli.rb
 - lib/apperol/version.rb
-homepage: ''
+homepage: https://github.com/ys/apperol
 licenses:
 - MIT
 metadata: {}