lanekit 0.7.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Zjk5ZTM1ZGRhNzMzYjRhYjVhMDRhMzQyOTQwNGQxMDUyMTliM2FkMg==
+    NzNmZTdiNTkwYTJjOWQyMTBmYTY1ZjhjODJmNmIzYzk5MDhhZGNlMA==
   data.tar.gz: !binary |-
-    MzRiMTQzMDJkOGQ4NjQxOTFkZDY4NTU3ODY2MTA1NjAyMWIwZTA1ZA==
+    MDYwNzFhYjIxZGEyNjUxMmRjMzNiYTJkZjkwNDY5ZjdjNjM4ZTc4NQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDA3YTFhZDZkMGRiY2I0ZWZlM2JmN2RkNTM3YjJiOWNiMmY2ZThkYzk5Mzg0
-    ZmVjMGZjZGE2YmEwOGFlNDU3NjNmMjAwZWU3OThkNjc3MzRhMzNiZDFmOGQ1
-    NWUzNDc4MDZkNWRkZjQ0MWIyNGQ1MTUxYzhjNDQwMWM2ZjU5OWQ=
+    YmZkZTZmNzgwZmFjNDg4ODA0ZjM5ZTZkMjU4ZGUxZTE2OGFiNTQ0NjRjOWU1
+    ZjkwNmFjYzBhODc3YjAxMTMyMmI1NTkxYjVhNjY0ZWZkMmUwOGJiYmNhZWYx
+    NDQ5N2FlYjdjZjhmZGIzYjJiYTdjZGM2M2Q1MDRmYzEwZjhjODY=
   data.tar.gz: !binary |-
-    NzFhOTJlOTRmNTJkZGQ5OGRiY2M5MjAxNjQ1NDc5NjI2NDJlZGVmMDJkNzM5
-    YjIyZDkxZjNmNjkwNTI5MGQyNzA1OTIxNjZiOTMzMzk1MGMwN2E2ZDAyMzU1
-    OWZiMWE5ZjU0NjJlZGM1MGIxZjA1ZmNjMmU4ZWRmMTkyOWNmNzk=
+    YmU2NGJiMDE3NzgzNDlhMTAxZWU5YTc3ZmZiOGQxMzU0MjkxYWIwOTE3NTU5
+    MjZlMWIzMzFmNzk2YzhiNWZmYjM4ZjFlYzk3ODczZTllMDJjZjkwMTMwYzJh
+    YWQ1YTZjNTE0YmFmZGI3MGY4YTAxMGQ5YzZkYWVmYzhiYTM4OWM=

data/lib/lanekit.rb

@@ -55,6 +55,32 @@ module LaneKit
     project.save
   end  
 
+  # Adds a acknowledgements.plist line to a CocoaPods Podfile
+  def self.add_acknowledgements_to_podfile(app_name)
+    podfile_path = File.expand_path('Podfile')
+    if !File.exists?(podfile_path)
+      puts "Can't find Podfile #{podfile_path}"
+      return
+    end
+
+    str = "
+post_install do | installer |
+  require 'fileutils'
+  FileUtils.cp_r('Pods/Pods-acknowledgements.plist', '#{app_name}/#{app_name}/Resources/Settings.bundle/Acknowledgements.plist', :remove_destination => true)
+end
+"
+
+    if !self.does_text_exist_in_file?(podfile_path, "acknowledgements.plist")
+      open(podfile_path, 'a') do |file|
+        file.puts str
+      end
+    
+      system "pod install"
+    else
+      puts "The acknowledgements.plist already exists in Podfile"
+    end
+  end
+
   # Adds a pod file line to a CocoaPods Podfile
   def self.add_pod_to_podfile(pod_name)
     podfile_path = File.expand_path('Podfile')
@@ -77,7 +103,7 @@ module LaneKit
   # Returns an app name from a folder path.
   # "Tracker" => "Tracker", "~/Projects/Runner" => "Runner"
   def self.derive_app_name(app_path)
-    app_name = File.basename(app_path).to_s
+    File.basename(app_path).to_s
   end
 
   # Model names are lower case

data/lib/lanekit/new.rb

@@ -66,10 +66,18 @@ module LaneKit
         workspace_path = File.join(@app_path_full, "#{@app_name}.xcworkspace")
         say_status :clean, workspace_path, :yellow
         workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path)
-        container = "container:#{@app_name}/#{@app_name}.xcodeproj"
-        if workspace.include?(container)
-          workspace.projpaths.delete(container)
-          workspace.save_as(workspace_path)
+
+        this_app = 0
+        workspace.file_references.each do |reference|
+          ## https://github.com/CocoaPods/Xcodeproj/issues/190
+          if reference.path.include? @app_name
+            this_app += 1
+            if this_app > 1
+              workspace.file_references.delete(reference)
+              workspace.save_as(workspace_path)
+              break
+            end
+          end
         end
       end
       
@@ -85,6 +93,11 @@ module LaneKit
         Dir.chdir(@project_path) do
           puts "Installing CocoaPods for RestKit"
           system "pod install"
+
+        end
+        # Add the acknowledgements to the Pod file
+        Dir.chdir(@app_path_full) do
+          LaneKit.add_acknowledgements_to_podfile(@app_name)
         end
       end
       

data/lib/lanekit/version.rb

@@ -1,3 +1,3 @@
 module LaneKit
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/template/lanekit-ios-project/Podfile

@@ -5,10 +5,4 @@ inhibit_all_warnings!
 
 link_with ['lanekit-ios-project', 'lanekit-ios-projectTests'] 
 
-pod 'RestKit', '0.23.1'
-
-post_install do | installer |
-  require 'fileutils'
-  FileUtils.cp_r('../Pods/Pods-acknowledgements.plist', 'lanekit-ios-project/Resources/Settings.bundle/Acknowledgements.plist', :remove_destination => true)
-end
-
+pod 'RestKit', '0.23.2'

data/lib/template/lanekit-ios-project/lanekit-ios-project/lanekit-ios-project/Controllers/LKAppDelegate.h

@@ -8,4 +8,6 @@
 
 @property (strong, nonatomic) UIWindow *window;
 
++ (LKAppDelegate *)sharedAppDelegate;
+
 @end

data/lib/template/lanekit-ios-project/lanekit-ios-project/lanekit-ios-project/Controllers/LKAppDelegate.m

@@ -7,6 +7,25 @@
 
 @implementation LKAppDelegate
 
++ (LKAppDelegate *)sharedAppDelegate
+{
+    return (LKAppDelegate *)UIApplication.sharedApplication.delegate;
+}
+
++ (void)initialize
+{
+    if (self == [LKAppDelegate class]) {
+    }
+}
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+    }
+    return self;
+}
+
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     UIViewController *controller = UIViewController.new;

data/lib/template/provider_base.h.erb

@@ -20,6 +20,7 @@ typedef void(^<%=@provider_base_class_name%>CallbackBlock)(NSError *error, id re
 - (void)downloadWithCompletionBlock:(LKResourceProviderCallbackBlock)completionBlock;
 - (Class)modelClass;
 - (id)processResult:(RKMappingResult *)mappingResult withError:(NSError **)error;
+- (void)processError:(NSError *)error;
 - (RKResponseDescriptor *)responseDescriptor;
 
 @end

data/lib/template/provider_base.m.erb

@@ -20,12 +20,17 @@
   NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:baseURL]];
   RKResponseDescriptor *responseDescriptor = [self responseDescriptor];
   RKObjectRequestOperation *operation = [[RKObjectRequestOperation alloc] initWithRequest:request responseDescriptors:@[responseDescriptor]];
+
+  [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
   
   [operation setCompletionBlockWithSuccess:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
     NSError *error = nil;
     id result = [self processResult:mappingResult withError:&error];
     completionBlock(nil, result);
   } failure:^(RKObjectRequestOperation *operation, NSError *error) {
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+    [self processError:error];
     completionBlock(error, nil);
   }];
   [operation start];
@@ -43,6 +48,11 @@
   return nil;
 }
 
+// Subclasses can override this method
+- (void)processError:(NSError *)error
+{
+}
+
 // Subclasses may need to override this method
 - (RKResponseDescriptor *)responseDescriptor
 {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanekit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Larry Aasen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -67,7 +67,7 @@ description: ! 'LaneKit is an iOS Objective-C code generator for integration wit
   including fixtures and tests. LaneKit is a command line app written in Ruby and
   packaged as a Ruby Gem.'
 email:
-- larryaasen@gmail.com
+- ''
 executables:
 - lanekit
 extensions: []