cross-post 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b4eba1daf6b5020cabfb1fe6b5439abb8f0a6cf
-  data.tar.gz: abe89c4de8fd97f43a31d462fedfadffeb9c934a
+  metadata.gz: cad95c4752964bd36ca0abc3f8e0ab594089556c
+  data.tar.gz: cf5cff59a6e44a0087218ee0df288b0e284ea7b4
 SHA512:
-  metadata.gz: 15d9a991a38801246fb5290c77d5c3cd99775d9d571aa0ae43f9239a190733bb7316c41bb6737bb355a898ed8a299910826feda8fe5c5ee25d3952b1caa817e1
-  data.tar.gz: dbe761e4e3fdea90c350d0292606d47a5728a9ed5799179426274a86b0bb35bed59b4ad240e9a158e375999a8830580b24b89cc6bfe95919d9f268981bf63584
+  metadata.gz: 0b581489f6274491dc1f10eab224825d38d2a8ad4b189e07bd8dbb4c32274abb74ae5fad0e947e47c7bec2164a8d1bc147ad0f49212d64ff31b4182f036e78e7
+  data.tar.gz: a674da5801615fe01c9284f365b455d3f4c37eec695e11042d0e4f4a2dcb8786dbe1c4c1bb9aea516136bbd60ee77bf827d7cbdcbd64cd237ca7045ac32083cf

data/bin/mastodon-register

@@ -6,15 +6,24 @@ require 'launchy'
 require 'uri'
 
 config = CrossPost::Config.new
-url = config['mastodon.url']
+settings = config[:settings]
+
+url = settings['mastodon.url']
 unless url
 	print 'Mastodon URL ? '
 	url                    = gets.chomp
 	url = "https://#{url}" if URI.parse(url).class == URI::Generic
-	config['mastodon.url'] = url
+	settings['mastodon.url'] = url
+end
+
+user = settings['mastodon.user']
+unless user
+	print 'Mastodon username ? '
+	user                    = gets.chomp
+	settings['mastodon.user'] = user
 end
 
-client_id, client_secret = unless config['mastodon.consumer']
+client_id, client_secret = unless settings['mastodon.consumer']
 							   puts 'Creating new app'
 							   token        = SecureRandom.hex 64
 							   redirect_url = 'urn:ietf:wg:oauth:2.0:oob'
@@ -22,19 +31,23 @@ client_id, client_secret = unless config['mastodon.consumer']
 							   client = Mastodon::REST::Client.new base_url: url, bearer_token: token
 							   app    = client.create_app 'CrossPost', redirect_url,
 														  'read write', 'https://git.imirhil.fr/aeris/cross-post/'
-							   config['mastodon.consumer.key'] = app.client_id
-							   config['mastodon.consumer.secret'] = app.client_secret
+							   settings['mastodon.consumer.key'] = app.client_id
+							   settings['mastodon.consumer.secret'] = app.client_secret
 							   [app.client_id, app.client_secret]
 						   else
-							   [config['mastodon.consumer.key'], config['mastodon.consumer.secret']]
+							   [settings['mastodon.consumer.key'], settings['mastodon.consumer.secret']]
 						   end
 
 client = OAuth2::Client.new client_id, client_secret, site: url
 url    = client.auth_code.authorize_url redirect_uri: redirect_url
-Launchy.open url
+begin
+	Launchy.open url
+rescue
+	puts "Open your browser at this URL: #{url}"
+end
 
 print 'Token ? '
 token                    = gets.chomp
-config['mastodon.token'] = token
+settings['mastodon.token'] = token
 
-config.save
+settings.save

data/lib/cross-post/config.rb

@@ -113,7 +113,7 @@ class CrossPost
 		def load(name, file = nil)
 			file ||= "#{name}.yml"
 			file = File.join @dir, file
-			FileUtils.touch file unless File.exist? file
+			File.write(file, YAML.dump({})) unless File.exist? file
 			self[name] = FileSubConfig.new file
 		end
 	end

data/lib/cross-post/version.rb

@@ -1,3 +1,3 @@
 class CrossPost
-	VERSION = '0.2.0'.freeze
+	VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cross-post
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - aeris