permutation-tools 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d590e6fed36c7595c8397844ab89eadca25a2ab
-  data.tar.gz: 95f191de60e371e78ca7452c0cab8f29652f417d
+  metadata.gz: e8333c3a9db115f5e4b980e5c6c8eee9d0d57ace
+  data.tar.gz: bb9d9007ad703f2bbdb743b9187879133cc8ce52
 SHA512:
-  metadata.gz: 3279d4a2e589e1cc7af23913c3b1ed01a186699dcf2d3ff89cdd3c4e5aca4edd8aa180870a5ae161df6e0d7546f094f0d67a565b5ffaa131d3eba7d5ddcaac74
-  data.tar.gz: b53d792d8fb41c62f2337d933e28e88816a4e27328647f9cee33d94167ec89c171adb6890575edbfcebd291b88ca25ef030b24a4b02b11afa0b0268ed413b3c2
+  metadata.gz: ca2af212bc9489b365dc21558d99a3d0137271a2d08d4046a94e32b19e52087b3de6697d9301adc9f6835be7cbfbf006a04563dae46f4ad3a4f17580f53e9157
+  data.tar.gz: 3ca20b7846f092dc048560ea854d481f6c1813c81477ad660ddff846716375bfc96ecf8f3a34aad157d024d5bc4edac54253fff046b63fc506b57a160a811ac4

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/lib/ext/hash.rb

@@ -0,0 +1,6 @@
+class Hash
+  def slice(*keys)
+    keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
+    keys.each_with_object(self.class.new) { |k, hash| hash[k] = self[k] if has_key?(k) }
+  end
+end

data/lib/permutation-tools.rb

@@ -3,6 +3,7 @@ require 'faraday'
 require 'open-uri'
 require 'nokogiri'
 
+require_relative 'ext/hash'
 require_relative 'ext/scraper'
 
 require_relative 'tools/api'

data/lib/tools/api.rb

@@ -40,7 +40,7 @@ module Permutation
 
       def host
         @host = ENV['HOST'] ||
-                Permutation::Config.account['host'] ||
+                Permutation::Config.host ||
                 DEFAULT_HOST
       end
     end

data/lib/tools/config.rb

@@ -5,48 +5,40 @@ module Permutation
       REPOSITORY_CONFIG_FILE = File.join(Dir.pwd, '.permutation')
 
       def account
-        Permutation::Config.read(ACCOUNT_CONFIG_FILE) || begin
-          access_token = nil
-          json = {}
+        Permutation::Config.read(ACCOUNT_CONFIG_FILE) || init
+      end
+
+      def init
+        access_token = nil
+        json = {}
+
+        puts "Log In to Permutation"
+        email  = ask("Email: ")
+        password = ask("Password: ") {|q| q.echo = false}
 
-          puts "Log In to Permutation"
-          email  = ask("Email: ")
-          password = ask("Password: ") {|q| q.echo = false}
+        response = Permutation::API.post '/api/session.json', { email: email, password: password }
 
-          response = Permutation::API.post '/api/session.json', { email: email, password: password }
-          if response.status == 201
-            session = response.body.select{|k,_| ["email","access_token"].include? k}
-            json.merge! session
-            json.merge! host: Permutation::API.host unless Permutation::API.host == Permutation::API::DEFAULT_HOST
+        if response.status == 201
+          session = response.body.slice("email","access_token")
+          json.merge! session
+          json.merge! host: Permutation::API.host unless Permutation::API.host == Permutation::API::DEFAULT_HOST
 
-            write(json, ACCOUNT_CONFIG_FILE)
-            json
-          else
-            puts
-            puts "Invalid login credentials"
-            exit
-          end
+          write(json, ACCOUNT_CONFIG_FILE)
+          json
+        else
+          puts
+          puts "Invalid login credentials"
+          exit
         end
       end
 
-      # def repository
-      #   regex = /git@github\.com|git@bitbucket\.org:(.*)\.git/
-      #   Permutation::Config.read(REPOSITORY_CONFIG_FILE) || begin
-      #     json = {}
-      #     account_config = account
-      #     `git remote show origin | grep Fetch | cut -d: -f2-`.match(regex)
-      #     repo_name = $1
-      #
-      #     repos = Permutation::API.get('/api/repositories.json', 'Access-Token' => account_config['access_token']).body
-      #     if repo = repos['repositories'].detect{|repo| repo['name'] == repo_name}
-      #       json.merge! 'repo' => repo['name']
-      #       write(json, REPOSITORY_CONFIG_FILE)
-      #       json
-      #     else
-      #       puts "Unable to find repo #{repo_name}"
-      #     end
-      #   end
-      # end
+      def host
+        if config = Permutation::Config.read(ACCOUNT_CONFIG_FILE)
+          config['host']
+        else
+          nil
+        end
+      end
     end
 
 

data/lib/tools/release.rb

@@ -8,21 +8,26 @@ module Permutation
         sha = `git rev-parse #{remote_branch}`
 
         regex = /(git@github\.com|git@bitbucket\.org):(.*)\.git/
-        `git remote show origin | grep Fetch | cut -d: -f2-`.match(regex)
+        repo_url = `git remote show origin | grep Fetch | cut -d: -f2-`.strip
+        repo_url.match(regex)
         repo_name = $2
 
         response = Permutation::API.post(
           '/api/releases.json',
           options.merge({
             sha: sha,
+            repo_url:  repo_url,
             repo_name: repo_name
           }),
           { 'Access-Token' => account_config['access_token'] }
         )
 
         if response.status == 201
-          response.body["releases"].each do |release|
-            puts "Created release #{release['version']} for #{release['account']['name']}"
+          release = response.body
+          if options[:force]
+            puts "Updated release #{release['version']} for #{release['repository']['name']}"
+          else
+            puts "Created release #{release['version']} for #{release['repository']['name']}"
           end
         elsif response.status == 401
           puts "Unauthorized, please re-run permutation init"
@@ -31,7 +36,11 @@ module Permutation
           puts "Repository #{repo_name} not found"
           exit
         else
-          puts "Error"
+          if error = response.body
+            puts "Error: #{error['message']}"
+          else
+            puts "Error"
+          end
         end
       end
 
@@ -50,6 +59,10 @@ module Permutation
           #   options[:parent] = v
           # end
 
+          opts.on("-f", "--force [VERSION]", "Iterate using the new release") do |v|
+            options[:force] = v
+          end
+
           opts.on("-i", "--iterate [ITERATE]", "Iterate using the new release") do |v|
             options[:iterate] = v
           end

data/permutation-tools.gemspec

@@ -2,40 +2,47 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: permutation-tools 0.1.0 ruby lib
+# stub: permutation-tools 0.2.3 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "permutation-toolbelt"
-  s.version = "0.2.1"
+  s.name = "permutation-tools"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Ian Hunter"]
-  s.date = "2014-11-03"
+  s.date = "2015-08-24"
   s.description = ""
-  s.email = "ian@permutation.io"
+  s.email = "ianhunter@gmail.com"
   s.executables = ["permutation"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
-    ".document",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "bin/permutation",
+    "index.html",
+    "lib/ext/hash.rb",
+    "lib/ext/scraper.rb",
     "lib/permutation-tools.rb",
+    "lib/tools/api.rb",
+    "lib/tools/config.rb",
+    "lib/tools/mirror.rb",
+    "lib/tools/release.rb",
+    "lib/tools/server.rb",
     "permutation-tools.gemspec",
     "test/helper.rb",
     "test/test_permutation-tools.rb"
   ]
-  s.homepage = "http://github.com/permutation.io/toolbelt"
+  s.homepage = "http://github.com/ihunter/permutation-tools"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.6"
   s.summary = "Tools for working with Permutation"
 
   if s.respond_to? :specification_version then
@@ -46,6 +53,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<highline>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<semantic>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_development_dependency(%q<byebug>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -56,6 +65,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<highline>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<semantic>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<byebug>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -67,6 +78,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<highline>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<semantic>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<byebug>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -74,3 +87,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: permutation-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Ian Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -181,6 +181,7 @@ files:
 - VERSION
 - bin/permutation
 - index.html
+- lib/ext/hash.rb
 - lib/ext/scraper.rb
 - lib/permutation-tools.rb
 - lib/tools/api.rb