joyce 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa1b198571ca80749e7e0e1ca01ed9df2e2c233
-  data.tar.gz: 8d267c34c5eb8b3419963bfa2202b901d7b6ab88
+  metadata.gz: 0d42e1e79a1140e554ac88148a552d2b0587d00f
+  data.tar.gz: f392da031015657bdbd66acf2dcb1ad09984440f
 SHA512:
-  metadata.gz: 8a7b5193272e1b1152fedd96a4298367bc329f300e05eaa14a18ae7c1d923526cb240b03a61473a0df83a369d00e384d13162b44a2f446a0c579f76e68719ea6
-  data.tar.gz: e96a5f0d8c8d603e90505b6811af0df21f6e42bad2bd1a3a2285dd72f293a072b6946c666ec838bbf3fd0926d64aa96272cdd53d6d34cb4b3a8181b44c681962
+  metadata.gz: 307dd117a856a9328243eb805defef33cfbb8a32fe0e43cacd5a5e758c089d4d3c4c46f3205fe4c9f695da5b8cf8b5b99f85f7b2a61241b99c29c376af99f110
+  data.tar.gz: 1af7145be05a8df3df15da75c2e5878da645c92fa1dbee149ecc1b90a89ed8c08565aa3dc376a1995375e4c6dba5d39412502ac7bcff27064586b11cadc26fc1

data/example/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # example app gemfile
-gem 'joyce', '0.1.5'
+gem 'joyce', '0.1.6'
 gem 'bundler'
 gem 'pry'
 

data/example/Gemfile.lock

@@ -25,7 +25,7 @@ GEM
     erubis (2.7.0)
     gosu (0.10.6)
     i18n (0.7.0)
-    joyce (0.1.5)
+    joyce (0.1.6)
       actionpack (~> 4.2)
       gosu (~> 0.10)
       metacosm (~> 0.3)
@@ -69,7 +69,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  joyce (= 0.1.5)
+  joyce (= 0.1.6)
   pry
   rake
 

data/example/Rakefile

@@ -6,6 +6,9 @@ require 'joyce/tasks/build'
 
 task :app do
   Joyce::Tasks::AppBuilder.new.make({
-    app_name: "Joyce Example App"
+    app_name: "joyce-example",
+    app_class_name: 'Example::Application',
+    template_location: "../dist/Ruby.app",
+    target_directory: "../dist"
   })
 end

data/lib/joyce/tasks/build.rb

@@ -3,91 +3,69 @@ module Joyce
     class AppBuilder
       include FileUtils
 
-      def make(app_name:)
-        target_app_bundle_root = File.join("..", "dist", "#{app_name}.app")
-
-        puts "--- build os x app here!"
-        cp_r "../dist/Ruby.app", target_app_bundle_root
+      def make(app_name:, app_class_name:, template_location:, target_directory:)
+        target_app_bundle_root = File.join(target_directory, "#{app_name}.app")
+        cp_r template_location, target_app_bundle_root
         puts "--- Ruby.app copied!"
 
         puts "--- copying your source code..."
-        cp_r "lib", "#{target_app_bundle_root}/Contents/Resources/lib"
-
-        puts "--- Analyzing your gems..."
-        p Bundler.definition.specs_for([:default])
-
-        puts "--- Okay, let's copy gems in..."
+        cp_r "lib/.", "#{target_app_bundle_root}/Contents/Resources/lib"
+        puts "--- source code copied in!"
 
+        puts "--- let's copy gems in..."
         gem_destination = "#{target_app_bundle_root}/Contents/Resources/vendor"
 
-        # info "Copying source gems from system"
         binary_gems_to_ignore = %w[ gosu minitest ]
         gem_list = vendored_gem_names(ignoring: binary_gems_to_ignore)
 
         copy_gems(gem_list, destination: File.join(gem_destination))
+        puts "--- gems copied"
 
-        write_main_rb(root: target_app_bundle_root) #(app_class: "#{app_name}::Application")
+        puts "--- writing main.rb..."
+        write_main_rb(app_class_name: app_class_name, root: target_app_bundle_root, app_name: app_name)
+        puts "--- main.rb written!"
       end
 
-      def write_main_rb(root:)
-	File.open("#{root}/Contents/Resources/main.rb", "w") do |file|
-	  require_paths = gemspecs.map do |spec|
-	    spec.require_paths.map {|path| "#{spec.name}-#{spec.version}/#{path}" }
-	  end
-
-	  file.puts <<-ruby
-            $stdout.reopen("/Users/joe/joyce/game.log", "w")
-            $stderr.reopen("/Users/joe/joyce/err.log", "w")
-
-            puts "--- unshifting gem paths"
-
-	    GEM_REQUIRE_PATHS = #{require_paths.flatten.inspect}
-
-	    GEM_REQUIRE_PATHS.each do |path|
-	      $LOAD_PATH.unshift File.expand_path(File.join("../vendor/gems", path), __FILE__)
-	    end
-
-            puts "--- gems shifted"
-
-            require 'forwardable'
+      def write_main_rb(root:,app_name:,app_class_name:)
+        File.open("#{root}/Contents/Resources/main.rb", "w") do |file|
+          require_paths = gemspecs.map do |spec|
+            spec.require_paths.map {|path| "#{spec.name}-#{spec.version}/#{path}" }
+          end
+
+          file.puts <<-ruby
+            $stdout.reopen("#{Dir.home}/#{app_name}/app.log", "w")
+            $stderr.reopen("#{Dir.home}/#{app_name}/err.log", "w")
+            GEM_REQUIRE_PATHS = #{require_paths.flatten.inspect}
+            GEM_REQUIRE_PATHS.each do |path|
+              $LOAD_PATH.unshift File.expand_path(File.join("../vendor/gems", path), __FILE__)
+            end
             require 'joyce'
             require 'application'
-            
-            Example::Application.kickstart!
+            #{app_class_name}.kickstart!
             ruby
-	end
+        end
       end
 
       # the gem approach from releasy: https://github.com/Spooner/releasy/blob/master/lib/releasy/mixins/has_gemspecs.rb
-      # basically just copy over your own system gems, ignoring binary things
-      # then we'll write out a prelude in main.rb that $unshifts the load path for each of these :/
-      # but it should almost certainly work!
       def copy_gems(gems, destination:)
-	gems_dir = "#{destination}/gems"
-	# specs_dir = "#{destination}/specifications"
-	mkdir_p gems_dir #, fileutils_options
-	# mkdir_p specs_dir, fileutils_options
-
-	gems.each do |gem|
-	  spec = gemspecs.find {|g| g.name == gem }
-	  gem_dir = spec.full_gem_path
-	  puts "Copying gem: #{spec.name} #{spec.version}"
-
-	  cp_r gem_dir, gems_dir
-	  #,  fileutils_options
-	  # spec_file = File.expand_path("../../specifications/#{File.basename gem_dir}.gemspec", gem_dir)
-	  # cp_r spec_file, specs_dir, fileutils_options
-	end
+        gems_dir = "#{destination}/gems"
+        mkdir_p gems_dir
+        gems.each do |gem|
+          spec = gemspecs.find { |g| g.name == gem }
+          gem_dir = spec.full_gem_path
+          puts "Copying gem: #{spec.name} #{spec.version}"
+          cp_r gem_dir, gems_dir
+        end
       end
 
       def vendored_gem_names(ignoring:)
-	(gemspecs.map(&:name) - ignoring).sort
+        (gemspecs.map(&:name) - ignoring).sort
       end
 
       private
 
       def gemspecs
-	@gemspecs ||= Bundler.definition.specs_for([:default])
+        @gemspecs ||= Bundler.definition.specs_for([:default])
       end
     end
   end

data/lib/joyce/version.rb

@@ -1,4 +1,4 @@
 module Joyce
   # joyce version
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joyce
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Joseph Weissman